From db30b67dc570d59f964c2bd237d788d4f007e8d4 Mon Sep 17 00:00:00 2001
From: Erik Ramfelt <eramfelt@gmail.com>
Date: Sun, 2 Oct 2011 21:55:57 +0200
Subject: [PATCH 1/9] Updated the since doc for UserAvatarResolver

---
 core/src/main/java/hudson/tasks/UserAvatarResolver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/tasks/UserAvatarResolver.java b/core/src/main/java/hudson/tasks/UserAvatarResolver.java
index 890c8db43f..c169f525b6 100644
--- a/core/src/main/java/hudson/tasks/UserAvatarResolver.java
+++ b/core/src/main/java/hudson/tasks/UserAvatarResolver.java
@@ -49,7 +49,7 @@ import hudson.model.User;
  * </pre>
  *
  * @author Erik Ramfelt
- * @since 1.433
+ * @since 1.434
  */
 public abstract class UserAvatarResolver implements ExtensionPoint {
 

From 9b1633b9b1264898f5a9f65c589692e329d03787 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 4 Oct 2011 15:14:08 +0300
Subject: [PATCH 2/9] fix changelog

---
 changelog.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/changelog.html b/changelog.html
index ea4293dbf2..0a737ca39d 100644
--- a/changelog.html
+++ b/changelog.html
@@ -77,14 +77,16 @@ Upcoming changes</a>
   <li class=bug>
     Resizable textarea handle does not work if CodeMirror is enabled
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11132">issue 11132</a>)
-
+  <li class=bug>
+    "Alternate settings file" build parameter is getting cleaned after job execution
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10955">issue 10955</a>)
+  <li class=rfe>
+    upgrade Apache Maven Wagon to 2.0.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11164">issue 11164</a>)    
 </ul>
 </div><!--=END=-->
 <h3><a name=v1.433>What's new in 1.433</a> (2011/10/01)</h3>
 <ul class=image>
-  <li class=bug>
-    "Alternate settings file" build parameter is getting cleaned after job execution
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10955">issue 10955</a>)
   <li class=bug>
     Port on HTTP Proxy Configure accepts characters except the digits
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11068">issue 11068</a>)
@@ -115,9 +117,6 @@ Upcoming changes</a>
     Concurrent build is no longer beta
   <li class=rfe>  
     Permission check added when viewing configuration of computer set.
-  <li class=rfe>
-    upgrade Apache Maven Wagon to 2.0.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11164">issue 11164</a>)
   <li class='major rfe'>  
     Maven project now supports arbitrary build steps
     (<a href="https://github.com/jenkinsci/jenkins/pull/233">pull #233</a>) 

From c793d96b39ee03f94e34f78e2e7a6688544efe4e Mon Sep 17 00:00:00 2001
From: Christoph Kutzinski <kutzi@gmx.de>
Date: Sat, 8 Oct 2011 17:57:17 +0200
Subject: [PATCH 3/9] exclude evil old nekohtml library

---
 maven-plugin/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 02ea08701f..f9d20482be 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -313,6 +313,17 @@ THE SOFTWARE.
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-webdav-jackrabbit</artifactId>
       <version>${wagonVersion}</version>
+      <exclusions>
+        <!-- prefer net.sourceforge.nekohtml:nekohtml:jar:1.9.13 so that we use consistent version across Jenkins -->
+        <exclusion>
+          <groupId>nekohtml</groupId>
+          <artifactId>nekohtml</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>nekohtml</groupId>
+          <artifactId>xercesMinimal</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
       <dependency>

From 948bff8f46eaf4dbe931771ae1ebc8b4973e7328 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 9 Oct 2011 15:17:26 -0700
Subject: [PATCH 4/9] [maven-release-plugin] prepare release jenkins-1.434

---
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 maven-plugin/pom.xml      | 2 +-
 pom.xml                   | 2 +-
 test/pom.xml              | 2 +-
 ui-samples-plugin/pom.xml | 2 +-
 war/pom.xml               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 2ce7f41b72..9f25514360 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.434-SNAPSHOT</version>
+    <version>1.434</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 590e8261fd..ef05e66cac 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.434-SNAPSHOT</version>
+    <version>1.434</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index f9d20482be..99a7d4c6a6 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.434-SNAPSHOT</version>
+    <version>1.434</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index da85d88b15..227c10c075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.434-SNAPSHOT</version>
+  <version>1.434</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
diff --git a/test/pom.xml b/test/pom.xml
index a8bcf7d85d..296a041bb6 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.434-SNAPSHOT</version>
+    <version>1.434</version>
   </parent>
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-test-harness</artifactId>
diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml
index 88f5831110..cf13a5a446 100644
--- a/ui-samples-plugin/pom.xml
+++ b/ui-samples-plugin/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.434-SNAPSHOT</version>
+    <version>1.434</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 29bdcd5263..d01889f922 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.434-SNAPSHOT</version>
+    <version>1.434</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

From 3784933174f1f7cf5800499e27c93a83069dc38a Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 9 Oct 2011 15:17:27 -0700
Subject: [PATCH 5/9] [maven-release-plugin] prepare for next development
 iteration

---
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 maven-plugin/pom.xml      | 2 +-
 pom.xml                   | 2 +-
 test/pom.xml              | 2 +-
 ui-samples-plugin/pom.xml | 2 +-
 war/pom.xml               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 9f25514360..b9abfd0259 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.434</version>
+    <version>1.435-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index ef05e66cac..1c7f2fc9ee 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.434</version>
+    <version>1.435-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 99a7d4c6a6..3d383015a2 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.434</version>
+    <version>1.435-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 227c10c075..57938b6ccd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.434</version>
+  <version>1.435-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
diff --git a/test/pom.xml b/test/pom.xml
index 296a041bb6..c2e577fe43 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.434</version>
+    <version>1.435-SNAPSHOT</version>
   </parent>
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-test-harness</artifactId>
diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml
index cf13a5a446..72113ddd0b 100644
--- a/ui-samples-plugin/pom.xml
+++ b/ui-samples-plugin/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.434</version>
+    <version>1.435-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index d01889f922..2e4b712513 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.434</version>
+    <version>1.435-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

From a0f503ff548446a2228805fbe48c761a6fa54166 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 9 Oct 2011 15:30:01 -0700
Subject: [PATCH 6/9] updated changelog for release

---
 changelog.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index 0a737ca39d..4e23415de4 100644
--- a/changelog.html
+++ b/changelog.html
@@ -61,7 +61,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.434>What's new in 1.434</a> <!--=DATE=--></h3>
+<h3><a name=v1.435>What's new in 1.435</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.434>What's new in 1.434</a> (2011/10/09)</h3>
 <ul class=image>
   <li class=rfe>
     Made build SCM change set a weak reference to reduce heap usage
@@ -84,7 +87,6 @@ Upcoming changes</a>
     upgrade Apache Maven Wagon to 2.0.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11164">issue 11164</a>)    
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.433>What's new in 1.433</a> (2011/10/01)</h3>
 <ul class=image>
   <li class=bug>

From 483e4cde7d3166cd09ee1b316edfed938fb15ccf Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 9 Oct 2011 15:30:01 -0700
Subject: [PATCH 7/9] releasing a new plugin parent POM

---
 plugins/pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/pom.xml b/plugins/pom.xml
index 55ed4be0b0..ae4e790a5b 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -10,7 +10,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.434-SNAPSHOT</version>
+  <version>1.434</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.434-SNAPSHOT</version>
+        <version>1.434</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -43,25 +43,25 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.434-SNAPSHOT</version>
+      <version>1.434</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.434-SNAPSHOT</version>
+      <version>1.434</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.434-SNAPSHOT</version>
+      <version>1.434</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>ui-samples-plugin</artifactId>
-      <version>1.434-SNAPSHOT</version>
+      <version>1.434</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 91593b8592b3fa7dbfbc4771274afb876cfe6384 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 9 Oct 2011 15:30:08 -0700
Subject: [PATCH 8/9] toward the next release

---
 plugins/pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/pom.xml b/plugins/pom.xml
index ae4e790a5b..c4df522eff 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -10,7 +10,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.434</version>
+  <version>1.435-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.434</version>
+        <version>1.435-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -43,25 +43,25 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.434</version>
+      <version>1.435-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.434</version>
+      <version>1.435-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.434</version>
+      <version>1.435-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>ui-samples-plugin</artifactId>
-      <version>1.434</version>
+      <version>1.435-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 2b7cbeb03c12c8bf543836d14efc862e18e5e0ba Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 9 Oct 2011 16:07:18 -0700
Subject: [PATCH 9/9] updated changelog as a part of the release

---
 debian/debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/debian/changelog b/debian/debian/changelog
index 45d2732543..851fb6ff47 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+jenkins (1.434) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 09 Oct 2011 15:55:38 -0700
+
 jenkins (1.433) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.