From 7c2254fbf8d643dc58673d01c97fd855f983d4bf Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Wed, 15 Oct 2014 18:42:22 -0700
Subject: [PATCH] [FIXED JENKINS-25169]

Integrated the new winstone.jar for 1.585
---
 changelog.html | 3 +++
 war/pom.xml    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index ac0872ac2f..7cb9cd1dc8 100644
--- a/changelog.html
+++ b/changelog.html
@@ -98,6 +98,9 @@ Upcoming changes</a>
   <li class=rfe>
     Improved the scalability of SSH slaves plugin caused by global lock in <tt>SecureRandom</tt>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-20108">issue 20108</a>)
+  <li class=bug>
+    Incorporated a fix for "Poodle" (CVE-2014-3566) vulnerability in the HTTPS connector of "java -jar jenkins.war"
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-25169">issue 25169</a>)
 </ul>
 </div><!--=END=-->
 <h3><a name=v1.584>What's new in 1.584</a> (2014/10/12)</h3>
diff --git a/war/pom.xml b/war/pom.xml
index e0fd167627..5c976e82cf 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -103,7 +103,7 @@ THE SOFTWARE.
       -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>2.6</version>
+      <version>2.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>