From 80b7a49904d0abac6e7b86844a98e1c54c130bfc Mon Sep 17 00:00:00 2001
From: Richard Mortimer <richm@oldelvet.org.uk>
Date: Fri, 16 Nov 2012 21:18:00 +0000
Subject: [PATCH 01/13] Add Iterators#wrap() to allow hiding of Iterable class
 implementation details

---
 core/src/main/java/hudson/util/Iterators.java | 30 +++++++++++++++++--
 .../test/java/hudson/util/IteratorsTest.java  | 15 ++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/util/Iterators.java b/core/src/main/java/hudson/util/Iterators.java
index 1a33bef083..2b5d88f74b 100644
--- a/core/src/main/java/hudson/util/Iterators.java
+++ b/core/src/main/java/hudson/util/Iterators.java
@@ -23,11 +23,8 @@
  */
 package hudson.util;
 
-import com.google.common.base.Objects;
-import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 
-import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -188,6 +185,33 @@ public class Iterators {
         };
     }
 
+    /**
+     * Returns an {@link Iterable} that lists items in the normal order
+     * but which hides the base iterator implementation details.
+     *
+     * @since 1.492
+     */
+    public static <T> Iterable<T> wrap(final Iterable<T> base) {
+        return new Iterable<T>() {
+            public Iterator<T> iterator() {
+                final Iterator<T> itr = base.iterator();
+                return new Iterator<T>() {
+                    public boolean hasNext() {
+                        return itr.hasNext();
+                    }
+
+                    public T next() {
+                        return itr.next();
+                    }
+
+                    public void remove() {
+                        itr.remove();
+                    }
+                };
+            }
+        };
+    }
+
     /**
      * Returns a list that represents [start,end).
      *
diff --git a/core/src/test/java/hudson/util/IteratorsTest.java b/core/src/test/java/hudson/util/IteratorsTest.java
index ec0a518f38..5c6df4f4c1 100644
--- a/core/src/test/java/hudson/util/IteratorsTest.java
+++ b/core/src/test/java/hudson/util/IteratorsTest.java
@@ -26,6 +26,7 @@ package hudson.util;
 import hudson.util.Iterators.CountingPredicate;
 import junit.framework.TestCase;
 
+import java.util.Iterator;
 import java.util.List;
 
 import static java.util.Arrays.*;
@@ -51,6 +52,20 @@ public class IteratorsTest extends TestCase {
         assertEquals(3, lst.size());
     }
 
+    public void testWrap() {
+        List<Integer> lst = Iterators.sequence(1,4);
+        Iterable<Integer> wrapped = Iterators.wrap(lst);
+        assertFalse(wrapped instanceof List);
+        Iterator<Integer> iter = wrapped.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(1,(int)iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(2,(int)iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(3,(int)iter.next());
+        assertFalse(iter.hasNext());
+    }
+
     public void testLimit() {
         assertEquals("[0]",com.google.common.collect.Iterators.toString(Iterators.limit(asList(0,1,2,3,4).iterator(), EVEN)));
         assertEquals("[]", com.google.common.collect.Iterators.toString(Iterators.limit(asList(1,2,4,6).iterator(), EVEN)));

From e429b6979b5d736bbbb1168a743c9e32801e2a9b Mon Sep 17 00:00:00 2001
From: Richard Mortimer <richm@oldelvet.org.uk>
Date: Fri, 16 Nov 2012 21:33:34 +0000
Subject: [PATCH 02/13] [FIXED JENKINS-15499] HistoryWidget/entry.jelly throws
 NullPointerException

Wrap history iterable to hide class implementation details.
Jelly was getting confused by the history underlying class being implemented
as an extension of Map
---
 changelog.html                                       | 3 +++
 core/src/main/java/hudson/widgets/HistoryWidget.java | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index d254fbd756..decbd9d25f 100644
--- a/changelog.html
+++ b/changelog.html
@@ -63,6 +63,9 @@ Upcoming changes</a>
 <div id="rc" style="display:none;"><!--=BEGIN=-->
 <h3><a name=v1.491>What's new in 1.491</a> <!--=DATE=--></h3>
 <ul class=image>
+  <li class='major bug'>
+    HistoryWidget/entry.jelly throws NullPointerException
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15499">issue 15499</a>)
   <li class="major bug">
     <code>ArrayIndexOutOfBoundsException</code> or <code>StringIndexOutOfBoundsException</code> launching processes such as Mercurial polling. (Regression in 1.489.)
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15733">issue 15733</a>)
diff --git a/core/src/main/java/hudson/widgets/HistoryWidget.java b/core/src/main/java/hudson/widgets/HistoryWidget.java
index 28f7daf404..857df6ca88 100644
--- a/core/src/main/java/hudson/widgets/HistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/HistoryWidget.java
@@ -26,6 +26,8 @@ package hudson.widgets;
 import hudson.Functions;
 import hudson.model.ModelObject;
 import hudson.model.Run;
+import hudson.util.Iterators;
+
 import org.kohsuke.stapler.Header;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.Stapler;
@@ -133,7 +135,7 @@ public class HistoryWidget<O extends ModelObject,T> extends Widget {
                 return updateFirstTransientBuildKey(lst);
             }
         } else
-            return updateFirstTransientBuildKey(baseList);
+            return updateFirstTransientBuildKey(Iterators.wrap(baseList));
     }
 
     public boolean isTrimmed() {

From a3742920fdfe3fdfb6c5f27781de8a5350f07ac7 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sat, 17 Nov 2012 10:55:50 -0800
Subject: [PATCH 03/13] added a test case

---
 .../java/hudson/widgets/HistoryWidget.java    |  4 +++-
 .../hudson/widgets/HistoryWidgetTest.groovy   | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 test/src/test/groovy/hudson/widgets/HistoryWidgetTest.groovy

diff --git a/core/src/main/java/hudson/widgets/HistoryWidget.java b/core/src/main/java/hudson/widgets/HistoryWidget.java
index 857df6ca88..a2ec051839 100644
--- a/core/src/main/java/hudson/widgets/HistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/HistoryWidget.java
@@ -134,8 +134,10 @@ public class HistoryWidget<O extends ModelObject,T> extends Widget {
                 trimmed = itr.hasNext(); // if we don't have enough items in the base list, setting this to false will optimize the next getRenderList() invocation.
                 return updateFirstTransientBuildKey(lst);
             }
-        } else
+        } else {
+            // to prevent baseList's concrete type from getting picked up by <j:forEach> in view
             return updateFirstTransientBuildKey(Iterators.wrap(baseList));
+        }
     }
 
     public boolean isTrimmed() {
diff --git a/test/src/test/groovy/hudson/widgets/HistoryWidgetTest.groovy b/test/src/test/groovy/hudson/widgets/HistoryWidgetTest.groovy
new file mode 100644
index 0000000000..6493c6cec2
--- /dev/null
+++ b/test/src/test/groovy/hudson/widgets/HistoryWidgetTest.groovy
@@ -0,0 +1,23 @@
+package hudson.widgets
+
+import org.jvnet.hudson.test.HudsonTestCase
+import org.jvnet.hudson.test.Bug
+
+/**
+ *
+ *
+ * @author Kohsuke Kawaguchi
+ */
+class HistoryWidgetTest extends HudsonTestCase {
+    @Bug(15499)
+    void testMoreLink() {
+        def p = createFreeStyleProject();
+        for (x in 1..3) {
+            assertBuildStatusSuccess(p.scheduleBuild2(0))
+        }
+
+        def wc = createWebClient()
+        wc.javaScriptEnabled = false
+        wc.goTo("job/${p.name}/buildHistory/all");
+    }
+}

From 80fa3c6bbc9287c3c53ce8046544b4f105eba0d2 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 13 Nov 2012 12:24:25 -0800
Subject: [PATCH 04/13] Fixed a regression introduced by pull request #606
 (cherry picked from commit d7b59bfc7d726e80d29e6c7ae5c2927744f727f3)

---
 core/src/main/java/hudson/tasks/Maven.java          |  6 ++++++
 .../main/resources/hudson/tasks/Maven/config.jelly  | 13 ++++++++-----
 .../resources/hudson/tasks/Maven/help-settings.html |  0
 3 files changed, 14 insertions(+), 5 deletions(-)
 rename war/src/main/webapp/help/tasks/maven/maven-settings.html => core/src/main/resources/hudson/tasks/Maven/help-settings.html (100%)

diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index e3a247c4c7..de3ca368d7 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -394,6 +394,12 @@ public class Maven extends Builder {
             return "/help/project-config/maven.html";
         }
 
+        @Override
+        public String getHelpFile(String fieldName) {
+            if (fieldName.equals("globalSettings")) fieldName = "settings"; // same help file
+            return super.getHelpFile(fieldName);
+        }
+
         public String getDisplayName() {
             return Messages.Maven_DisplayName();
         }
diff --git a/core/src/main/resources/hudson/tasks/Maven/config.jelly b/core/src/main/resources/hudson/tasks/Maven/config.jelly
index d0e92aa9b0..f08e941d54 100644
--- a/core/src/main/resources/hudson/tasks/Maven/config.jelly
+++ b/core/src/main/resources/hudson/tasks/Maven/config.jelly
@@ -50,11 +50,14 @@ THE SOFTWARE.
     <f:entry field="usePrivateRepository" title="${%Use private Maven repository}" help="/plugin/maven-plugin/private-repository.html">
       <f:checkbox checked="${it.usesPrivateRepository()}" />
     </f:entry>
-    <f:entry title="${%Settings file}" field="settings" help="/help/tasks/maven/maven-settings.html">
-       <f:dropdownDescriptorSelector descriptors="${descriptor.settingsProviders}"/>
+    <f:dropdownDescriptorSelector title="${%Settings file}" descriptors="${descriptor.settingsProviders}" field="settings"/>
+<!--
+    <f:entry   help="/help/tasks/maven/maven-settings.html">
+
     </f:entry>
-    <f:entry title="${%Global Settings file}" field="globalSettings" help="/help/tasks/maven/maven-settings.html">
-       <f:dropdownDescriptorSelector descriptors="${descriptor.globalSettingsProviders}"/>
-    </f:entry>          
+    <f:entry   help="/help/tasks/maven/maven-settings.html">
+    </f:entry>
+-->
+    <f:dropdownDescriptorSelector title="${%Global Settings file}" field="globalSettings" descriptors="${descriptor.globalSettingsProviders}"/>
   </f:advanced>
 </j:jelly>
\ No newline at end of file
diff --git a/war/src/main/webapp/help/tasks/maven/maven-settings.html b/core/src/main/resources/hudson/tasks/Maven/help-settings.html
similarity index 100%
rename from war/src/main/webapp/help/tasks/maven/maven-settings.html
rename to core/src/main/resources/hudson/tasks/Maven/help-settings.html

From 894218d6a60d1da0cf3ecf81a47d4053c61ee6f3 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 13 Nov 2012 14:03:17 -0800
Subject: [PATCH 05/13] another test regression fix (cherry picked from commit
 bdad2a3d48be5cb0b7d0cfef0050a5b7e94cbe41)

---
 .../src/main/java/hudson/maven/MavenModuleSet.java     |  7 +++++++
 .../maven/MavenModuleSet/configure-entries.jelly       | 10 ++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
index 15685a6db8..69be88b259 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
@@ -1182,6 +1182,13 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
             mavenValidationLevels.put( "LEVEL_STRICT", ModelBuildingRequest.VALIDATION_LEVEL_STRICT );
         }
 
+        @Override
+        public String getHelpFile(String fieldName) {
+            String v = super.getHelpFile(fieldName);
+            if (v!=null)    return v;
+            return Jenkins.getInstance().getDescriptor(Maven.class).getHelpFile(fieldName);
+        }
+
         public List<SettingsProviderDescriptor> getSettingsProviders() {
             return Jenkins.getInstance().getDescriptorList(SettingsProvider.class);
         }
diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
index a36d55005b..ae4aa54f81 100644
--- a/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
@@ -113,14 +113,8 @@ THE SOFTWARE.
         </select>
       </f:entry>     
       
-      <f:entry title="${%Settings file}" field="settings" help="/help/tasks/maven/maven-settings.html">
-          <f:dropdownDescriptorSelector descriptors="${descriptor.settingsProviders}"/>
-      </f:entry>
-
-      <f:entry title="${%Global Settings file}" field="globalSettings" help="/help/tasks/maven/maven-settings.html">
-          <f:dropdownDescriptorSelector descriptors="${descriptor.globalSettingsProviders}"/>
-      </f:entry>      
-
+      <f:dropdownDescriptorSelector title="${%Settings file}" field="settings" descriptors="${descriptor.settingsProviders}"/>
+      <f:dropdownDescriptorSelector title="${%Global Settings file}" field="globalSettings"  descriptors="${descriptor.globalSettingsProviders}"/>
     </f:advanced>
   </f:section>
 

From 2cb3e83849bdcbe074fb0444e4989594caf2f6e6 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sat, 17 Nov 2012 12:01:55 -0800
Subject: [PATCH 06/13] [FIXED SECURITY-44]

---
 changelog.html | 2 ++
 war/pom.xml    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index decbd9d25f..ca5d4d2608 100644
--- a/changelog.html
+++ b/changelog.html
@@ -69,6 +69,8 @@ Upcoming changes</a>
   <li class="major bug">
     <code>ArrayIndexOutOfBoundsException</code> or <code>StringIndexOutOfBoundsException</code> launching processes such as Mercurial polling. (Regression in 1.489.)
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15733">issue 15733</a>)
+  <li class=bug>
+    Fixed an XSS and a few open-redirect problems
   <li class=rfe>
     Support failsafe the same way as surefire in maven2 jobs
 </ul>
diff --git a/war/pom.xml b/war/pom.xml
index 8fda8adf03..cc86d1ccc7 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -104,7 +104,7 @@ THE SOFTWARE.
       -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>0.9.10-jenkins-39</version>
+      <version>0.9.10-jenkins-40</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 68e84726ab9bc1c79fb9118f2c866b8a37421a73 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sat, 17 Nov 2012 12:02:20 -0800
Subject: [PATCH 07/13] [FIXED SECURITY-45]

---
 core/src/main/java/hudson/Util.java           | 25 +++++++++++++++++++
 .../hudson/model/DirectoryBrowserSupport.java |  2 +-
 .../AuthenticationProcessingFilter2.java      |  4 +++
 core/src/test/java/hudson/UtilTest.java       | 10 ++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index a93ef736d0..782d94e8fe 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -1233,6 +1233,31 @@ public class Util {
         return s==null ? s : s.intern();
     }
 
+    /**
+     * Return true if the systemId denotes an absolute URI .
+     *
+     * The same algorithm can be seen in {@link URI}, but
+     * implementing this by ourselves allow it to be more lenient about
+     * escaping of URI.
+     */
+    public static boolean isAbsoluteUri(String uri) {
+        int idx = uri.indexOf(':');
+        if (idx<0)  return false;   // no ':'. can't be absolute
+
+        // #, ?, and / must not be before ':'
+        return idx<_indexOf(uri, '#') && idx<_indexOf(uri,'?') && idx<_indexOf(uri,'/');
+    }
+
+    /**
+     * Works like {@link String#indexOf(int)} but 'not found' is returned as s.length(), not -1.
+     * This enables more straight-forward comparison.
+     */
+    private static int _indexOf(String s, char ch) {
+        int idx = s.indexOf(ch);
+        if (idx<0)  return s.length();
+        return idx;
+    }
+
     /**
      * Loads a key/value pair string as {@link Properties}
      * @since 1.392
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
index 3d9753a6f9..d924710c76 100644
--- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -137,7 +137,7 @@ public final class DirectoryBrowserSupport implements HttpResponse {
         String pattern = req.getParameter("pattern");
         if(pattern==null)
             pattern = req.getParameter("path"); // compatibility with Hudson<1.129
-        if(pattern!=null) {
+        if(pattern!=null && !Util.isAbsoluteUri(pattern)) {// avoid open redirect
             rsp.sendRedirect2(pattern);
             return;
         }
diff --git a/core/src/main/java/hudson/security/AuthenticationProcessingFilter2.java b/core/src/main/java/hudson/security/AuthenticationProcessingFilter2.java
index faef1690a6..7f282199e8 100644
--- a/core/src/main/java/hudson/security/AuthenticationProcessingFilter2.java
+++ b/core/src/main/java/hudson/security/AuthenticationProcessingFilter2.java
@@ -31,6 +31,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import hudson.Util;
 import org.acegisecurity.Authentication;
 import org.acegisecurity.AuthenticationException;
 import org.acegisecurity.ui.webapp.AuthenticationProcessingFilter;
@@ -51,6 +52,9 @@ public class AuthenticationProcessingFilter2 extends AuthenticationProcessingFil
         if (targetUrl == null)
             return getDefaultTargetUrl();
 
+        if (Util.isAbsoluteUri(targetUrl))
+            return "."; // avoid open redirect
+
         // URL returned from determineTargetUrl() is resolved against the context path,
         // whereas the "from" URL is resolved against the top of the website, so adjust this.
         if(targetUrl.startsWith(request.getContextPath()))
diff --git a/core/src/test/java/hudson/UtilTest.java b/core/src/test/java/hudson/UtilTest.java
index 8461ee2ee7..c4738cbb6d 100644
--- a/core/src/test/java/hudson/UtilTest.java
+++ b/core/src/test/java/hudson/UtilTest.java
@@ -290,4 +290,14 @@ public class UtilTest {
 			}
 		}
     }
+
+    public void testIsAbsoluteUri() {
+        assertTrue(Util.isAbsoluteUri("http://foobar/"));
+        assertTrue(Util.isAbsoluteUri("mailto:kk@kohsuke.org"));
+        assertTrue(Util.isAbsoluteUri("d123://test/"));
+        assertFalse(Util.isAbsoluteUri("foo/bar/abc:def"));
+        assertFalse(Util.isAbsoluteUri("foo?abc:def"));
+        assertFalse(Util.isAbsoluteUri("foo#abc:def"));
+        assertFalse(Util.isAbsoluteUri("foo/bar"));
+    }
 }

From f9546d37f44da244bf1e6f25fa9153fbdd9c26f0 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sat, 17 Nov 2012 12:02:56 -0800
Subject: [PATCH 08/13] [FIXED SECURITY-43]

---
 .../src/main/resources/hudson/widgets/HistoryWidget/entry.jelly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
index 38f944a438..c5d99b5778 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
@@ -68,7 +68,7 @@ THE SOFTWARE.
     <tr class="${transitive}">
       <td></td>
       <td colspan="2" class="desc">
-        <j:out value="${build.truncatedDescription}"/>
+        <j:out value="${app.markupFormatter.translate(build.truncatedDescription)}"/>
       </td>
     </tr>
   </j:if>

From eeb99ed843db258252479ea74ed3deac71777656 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 18 Nov 2012 10:20:44 -0800
Subject: [PATCH 09/13] increased the timeout to 180

---
 test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
index 63dc15e7c5..c7cc481250 100644
--- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
@@ -258,7 +258,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
     /**
      * Number of seconds until the test times out.
      */
-    public int timeout = 90;
+    public int timeout = 180;
 
     private volatile Timer timeoutTimer;
 

From 6071bfd8fab8060521111375255bbeec28aefb50 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 18 Nov 2012 10:44:03 -0800
Subject: [PATCH 10/13] [maven-release-plugin] prepare release jenkins-1.491

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

diff --git a/cli/pom.xml b/cli/pom.xml
index 37f25510f7..0e33af0a07 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.491-SNAPSHOT</version>
+    <version>1.491</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 7701a52238..0f6c90a0e8 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.491-SNAPSHOT</version>
+    <version>1.491</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 53dd7c2035..d984188b96 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.491-SNAPSHOT</version>
+    <version>1.491</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 149edfbc99..291eecd3c7 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -11,7 +11,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.491-SNAPSHOT</version>
+  <version>1.491</version>
   <packaging>pom</packaging>
 
   <!--
@@ -34,7 +34,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.491-SNAPSHOT</version>
+        <version>1.491</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -44,25 +44,25 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.491-SNAPSHOT</version>
+      <version>1.491</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.491-SNAPSHOT</version>
+      <version>1.491</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.491-SNAPSHOT</version>
+      <version>1.491</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>ui-samples-plugin</artifactId>
-      <version>1.491-SNAPSHOT</version>
+      <version>1.491</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 1cfd6a4b15..c1d5c2de9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.491-SNAPSHOT</version>
+  <version>1.491</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
diff --git a/test/pom.xml b/test/pom.xml
index fcedb1314a..4b6ffd33f7 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.491-SNAPSHOT</version>
+    <version>1.491</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 314307dce1..572d52c37c 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.491-SNAPSHOT</version>
+    <version>1.491</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index cc86d1ccc7..c698dfda30 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.491-SNAPSHOT</version>
+    <version>1.491</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

From 28694d5be16612c866f51c34c9e85ac5bcc95d05 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 18 Nov 2012 10:44:04 -0800
Subject: [PATCH 11/13] [maven-release-plugin] prepare for next development
 iteration

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

diff --git a/cli/pom.xml b/cli/pom.xml
index 0e33af0a07..35e5a82ccb 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.491</version>
+    <version>1.492-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 0f6c90a0e8..2b3dd49b16 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.491</version>
+    <version>1.492-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index d984188b96..917d9eadb2 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.491</version>
+    <version>1.492-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 291eecd3c7..341775fc4c 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -11,7 +11,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.491</version>
+  <version>1.492-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -34,7 +34,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.491</version>
+        <version>1.492-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -44,25 +44,25 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.491</version>
+      <version>1.492-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.491</version>
+      <version>1.492-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.491</version>
+      <version>1.492-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>ui-samples-plugin</artifactId>
-      <version>1.491</version>
+      <version>1.492-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index c1d5c2de9b..e6dad5fd27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.491</version>
+  <version>1.492-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
diff --git a/test/pom.xml b/test/pom.xml
index 4b6ffd33f7..9715f24259 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.491</version>
+    <version>1.492-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 572d52c37c..5f9c56fdf7 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.491</version>
+    <version>1.492-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index c698dfda30..35e528962f 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.491</version>
+    <version>1.492-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

From b6d569c30f3807f272986bf350fd1e67baa5336b Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 18 Nov 2012 10:58:11 -0800
Subject: [PATCH 12/13] updated changelog for release

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

diff --git a/changelog.html b/changelog.html
index ca5d4d2608..a3375368f5 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.491>What's new in 1.491</a> <!--=DATE=--></h3>
+<h3><a name=v1.492>What's new in 1.492</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.491>What's new in 1.491</a> (2012/11/18)</h3>
 <ul class=image>
   <li class='major bug'>
     HistoryWidget/entry.jelly throws NullPointerException
@@ -74,7 +77,6 @@ Upcoming changes</a>
   <li class=rfe>
     Support failsafe the same way as surefire in maven2 jobs
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.490>What's new in 1.490</a> (2012/11/12)</h3>
 <ul class=image>
   <li class=bug>

From d6ea1ccfaeee417c857fba3bb60da90210f81a0b Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 18 Nov 2012 17:59:07 -0800
Subject: [PATCH 13/13] 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 ea3a5a4e79..42137b523c 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+jenkins (1.491) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 18 Nov 2012 17:42:14 -0800
+
 jenkins (1.490) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.