Recreating the RC branch of the week after the fact, and merging it back

to the master.

Conflicts:
	changelog.html

changelog.html

@@ -55,23 +55,15 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=rfe>
-    Support for gzipped log in consoleText
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10400">issue 10400</a>)
-  <li class=bug>
-    When run as "java -jar jenkins.war", failing to listen on HTTP ports should be fatal.
-  <li class=bug>
-    Fixed a race condition in the fingerprint computation 
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10346">issue 10346</a>)
-  <li class=bug>
-    Fixed an occasional NPE when running Maven jobs 
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-9822">issue 9822</a>)
   <li class=bug>
     Fixed Maven build error if headless option is set and MAVEN_OPTS empty
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10375">issue 10375</a>)
   <li class=bug>
     Tests not recognized as failed if test initialization failed
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-6700">issue 6700</a>)
+  <li class=rfe>
+    Support for gzipped log in consoleText
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10400">issue 10400</a>)
   <li class=rfe>
     Expand variables in the Maven POM definition in Maven projects.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-5885">issue 5885</a>)
@@ -81,7 +73,16 @@ 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.422>What's new in 1.422</a> <!--=DATE=--></h3>
-<!--=RC-CHANGES=-->
+<ul class=image>
+  <li class=bug>
+    When run as "java -jar jenkins.war", failing to listen on HTTP ports should be fatal.
+  <li class=bug>
+    Fixed a race condition in the fingerprint computation 
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10346">issue 10346</a>)
+  <li class=bug>
+    Fixed an occasional NPE when running Maven jobs 
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-9822">issue 9822</a>)
+</ul>
 </div><!--=END=-->
 <h3><a name=v1.421>What's new in 1.421</a> (2011/07/17)</h3>
 <ul class=image>

cli/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.422-SNAPSHOT</version>
+    <version>1.423-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>

core/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.422-SNAPSHOT</version>
+    <version>1.423-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -431,7 +431,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>3.3.0-jenkins-1</version>
+      <version>3.3.0-jenkins-2</version>
     </dependency>
     <dependency>
       <groupId>com.sun.akuma</groupId>

maven-plugin/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.422-SNAPSHOT</version>
+    <version>1.423-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>

plugins/pom.xml

@@ -10,7 +10,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.422-SNAPSHOT</version>
+  <version>1.423-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -33,7 +33,7 @@
       <dependency><!-- if a plugin wants to depend on the maven plugin, choose the right version automatically -->
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>maven-plugin</artifactId>
-        <version>1.422-SNAPSHOT</version>
+        <version>1.423-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -43,25 +43,25 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.422-SNAPSHOT</version>
+      <version>1.423-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.422-SNAPSHOT</version>
+      <version>1.423-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.422-SNAPSHOT</version>
+      <version>1.423-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>ui-samples-plugin</artifactId>
-      <version>1.422-SNAPSHOT</version>
+      <version>1.423-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

pom.xml

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.422-SNAPSHOT</version>
+  <version>1.423-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>

test/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.422-SNAPSHOT</version>
+    <version>1.423-SNAPSHOT</version>
   </parent>
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-test-harness</artifactId>

ui-samples-plugin/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.422-SNAPSHOT</version>
+    <version>1.423-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>

war/pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.422-SNAPSHOT</version>
+    <version>1.423-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>