From b2e19b72845666428e55fb8481b9ab0285e98f18 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 10 Jan 2012 22:28:40 -0800
Subject: [PATCH] incorporated a newer version of Winstone

---
 changelog.html | 12 ++++++++----
 war/pom.xml    |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/changelog.html b/changelog.html
index ecee43ce20..2ec0905615 100644
--- a/changelog.html
+++ b/changelog.html
@@ -61,14 +61,18 @@ Upcoming changes</a>
   <li class=bug>
     Fixed an occasional "URI must start with a slash" error when the anonymous user doesn't have the read access.
   <li class="rfe">
-  OS X installer can optionally create a new user &quot;jenkins&quot; and use
-  it. This user has a writable home directory, making it possible to set up ssh for Jenkins.
+    OS X installer can optionally create a new user &quot;jenkins&quot; and use
+    it. This user has a writable home directory, making it possible to set up ssh for Jenkins.
   <li class="rfe">
     No workspace available message includes wiped out workspace as a potential cause.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10432">issue 10432</a>)
   <li class="bug">
-  Stop users being created in memory if they failed to provide all the required registration information correctly.
-   (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7096">issue 7096</a>)
+    Stop users being created in memory if they failed to provide all the required registration information correctly.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7096">issue 7096</a>)
+  <li class=bug>
+    <tt>java -jar jenkins.war</tt> finally detects invalid command line options and report that as an error.
+  <li class=rfe>
+    When run in terminal, warning/error messages are colored.
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/war/pom.xml b/war/pom.xml
index 14cb28b975..4057b91206 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -51,7 +51,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>executable-war</artifactId>
-      <version>1.25</version>
+      <version>1.26</version>
       <scope>provided</scope>
     </dependency>
 
@@ -99,7 +99,7 @@ THE SOFTWARE.
       -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>0.9.10-jenkins-32</version>
+      <version>0.9.10-jenkins-33</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-- 
GitLab