merged back the RC branch

733954ee · Kohsuke Kawaguchi · 06cec8b0 · f3b00421 · 733954ee · 733954ee
14 changed file
--- a/changelog.html
+++ b/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.388>What's new in 1.388</a> <!--=DATE=--></h3>
+<h3><a name=v1.389>What's new in 1.389</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.388>What's new in 1.388</a> (2010/12/04)</h3>
 <ul class=image>
  <li class=bug>
    Failure to UDP broadcast shouldn't kill the Hudson bootup process.
@@ -73,7 +76,6 @@ Upcoming changes</a>
  <li class=rfe>
    Added "set-build-description" CLI command.
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.387>What's new in 1.387</a> (2010/11/27)</h3>
 <ul class=image>
  <li class=bug>
@@ -89,6 +91,10 @@ Upcoming changes</a>
    "Install as a service" now supports Vista and Windows 7.
  <li class=rfe>
    "Restart Hudson" button should appear when a plugin is manually installed.
+  <li class=rfe>
+    In this release only the background is changed until Dec 5th to i387 chip,
+    to celebrate our 1.387 release (the feature is time bombed and will revert
+    to the butler after that date.)
 </ul>
 <h3><a name=v1.386>What's new in 1.386</a> (2010/11/19)</h3>
 <ul class=image>

--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>pom</artifactId>
    <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.388-SNAPSHOT</version>
+    <version>1.389-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.388-SNAPSHOT</version>
+    <version>1.389-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>


--- a/debian/debian/changelog
+++ b/debian/debian/changelog
+hudson (1.388) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 05 Dec 2010 06:58:08 -0800
+
 hudson (1.387) 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.388-SNAPSHOT</version>
+    <version>1.389-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.388-SNAPSHOT</version>
+    <version>1.389-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.388-SNAPSHOT</version>
+    <version>1.389-SNAPSHOT</version>
  </parent>

  <artifactId>maven-plugin</artifactId>

--- a/plugins/pom.xml
+++ b/plugins/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <groupId>org.jvnet.hudson</groupId>
+    <artifactId>hudson</artifactId>
+    <version>1.7</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.jvnet.hudson.plugins</groupId>
+  <artifactId>plugin</artifactId>
+  <name>Hudson plugin POM</name>
+  <version>1.388</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <!-- if your java.net user name is different from local user name, specify it here -->
+    <java.net.id>${user.name}</java.net.id>
+  </properties>
+
+  <!--
+    We need the following because the artifactId=plugin but directoryName=plugins, and
+    Maven infers the wrong value if I don't specify it explicitly.
+  -->
+  <scm>
+    <connection>scm:svn:https://guest@svn.java.net/svn/hudson~svn/trunk/hudson/plugins/</connection>
+    <developerConnection>scm:svn:https://svn.java.net/svn/hudson~svn/trunk/hudson/plugins/</developerConnection>
+    <url>https://svn.java.net/svn/hudson~svn/trunk/hudson/plugins/</url>
+  </scm>
+
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://issues.hudson-ci.org/</url>
+  </issueManagement>
+
+  <dependencyManagement>
+    <dependencies>
+      <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.388</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jvnet.hudson.main</groupId>
+      <artifactId>hudson-war</artifactId>
+      <type>war</type>
+      <version>1.388</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jvnet.hudson.main</groupId>
+      <artifactId>hudson-core</artifactId>
+      <version>1.388</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jvnet.hudson.main</groupId>
+      <artifactId>hudson-test-harness</artifactId>
+      <version>1.388</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jvnet.hudson.main</groupId>
+      <artifactId>ui-samples-plugin</artifactId>
+      <version>1.388</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <!--
+      Maven is so brain-dead that when a dependency is like:
+
+      plugin -(provided)-> hudson-core -(compile)-> stapler -(provided)-> servlet-api
+
+      Artifacts beyond the provided/provided dependency will not be made available to the plugin.
+      See this in DefaultArtifactFactory.createArtifact() in the maven-artifact module.
+
+      So for us to have servlet API in the classpath, we need to explicitly list servlet-api.
+    -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <!--dependencyManagement>
+       <dependencies>
+       <dependency>
+       <groupId>org.jvnet.hudson.main</groupId>
+       <artifactId>maven-plugin</artifactId>
+       <version>1.388</version>
+       </dependency>
+       </dependencies>
+       </dependencyManagement-->
+
+  <build>
+    <!--
+      Since new versions need to overwrite old versions, it's better
+      not to have version number in the .hpi file name.
+    -->
+    <finalName>${project.artifactId}</finalName>
+    <!--
+      I don't really understand how this works, but it makes Maven recognizes
+      <packaging>hpi</packaging> defined in maven-hpi-plugin.
+
+      <extensions>true</extensions> is apparently needed to have Maven read
+      the plugin's Plexus component file.
+    -->
+    <defaultGoal>package</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.jvnet.hudson.tools</groupId>
+        <artifactId>maven-hpi-plugin</artifactId>
+        <version>1.54</version>
+        <extensions>true</extensions>
+        <configuration>
+          <showDeprecation>true</showDeprecation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.kohsuke.stapler</groupId>
+        <artifactId>maven-stapler-plugin</artifactId>
+        <version>1.12</version>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.0-beta-9</version>
+        <configuration>
+          <goals>deploy</goals>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.jvnet.localizer</groupId>
+        <artifactId>maven-localizer-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <fileMask>Messages.properties</fileMask>
+              <outputDirectory>target/generated-sources/localizer</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <!--
+          javadoc plugin 2.3 apparently interferes with the release process,
+          so sticking to 2.2 (http://www.nabble.com/description-setting-plugin-tp14846399p14950047.html)
+        -->
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.groovy.maven</groupId>
+        <artifactId>gmaven-plugin</artifactId>
+        <version>1.0-rc-5</version>
+        <executions>
+          <execution>
+            <id>test-in-groovy</id>
+            <!-- allow tests written in Groovy -->
+            <goals>
+              <goal>generateTestStubs</goal>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.6.5</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>hudson.udp</name>
+              <value>33849</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <repositories>
+    <repository>
+      <id>m.g.o-public</id>
+      <url>http://maven.glassfish.org/content/groups/public/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>m.g.o-public</id>
+      <url>http://maven.glassfish.org/content/groups/public/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
+</project>
--- a/plugins/update-dependency-hudson-version.rb
+++ b/plugins/update-dependency-hudson-version.rb
+#!/usr/bin/ruby
+# update the version of Hudson that this POM depends on from $1
+require "rexml/document"
+require "rexml/xpath"
+
+# version to update to
+v=ARGV.shift
+
+pom = REXML::Document.new $stdin
+pom.elements.each("//dependency[groupId='org.jvnet.hudson.main']") { |dep|
+  dep.elements["version"].text = v
+}
+pom.write $stdout
+
+
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
  
  <groupId>org.jvnet.hudson.main</groupId>
  <artifactId>pom</artifactId>
-  <version>1.388-SNAPSHOT</version>
+  <version>1.389-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.388-SNAPSHOT</version>
+    <version>1.389-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.388-SNAPSHOT</version>
+    <version>1.389-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.388-SNAPSHOT</version>
+    <version>1.389-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.388-SNAPSHOT</version>
+    <version>1.389-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>