From 82ded4d6754ff3f27500d68ebde3e6bc446a1f2d Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Mon, 28 Mar 2011 16:52:10 -0700
Subject: [PATCH] Using the latest Jetty to avoid a race condition that can
 create occasional test failures. See JETTY-1149.

---
 pom.xml      |  6 +++---
 test/pom.xml |  2 +-
 war/pom.xml  | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 329d1ca7ea..99b3e570fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,9 +241,9 @@ THE SOFTWARE.
           Since some developers try to run hudson-dev:run from main, define it here so that at least the plugin resolves.
           This enables us to report a better error message.
         -->
-        <groupId>org.jvnet.hudson.tools</groupId>
-        <artifactId>maven-hudson-dev-plugin</artifactId>
-        <version>6.1.7</version>
+        <groupId>org.jenkins-ci.tools</groupId>
+        <artifactId>maven-jenkins-dev-plugin</artifactId>
+        <version>6.1.26-jenkins-1</version>
       </plugin>
 
       <!--<plugin>
diff --git a/test/pom.xml b/test/pom.xml
index 8dffec4e6b..336f6dbd2c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -152,7 +152,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.11</version>
+      <version>6.1.26</version>
     </dependency>
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index c7df7df710..561c5424ac 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -134,11 +134,15 @@ THE SOFTWARE.
       </plugin>
       <plugin>
         <!-- this is really just a patched version of maven-jetty-plugin to workaround issue #932 -->
-        <groupId>org.jvnet.hudson.tools</groupId>
-        <artifactId>maven-hudson-dev-plugin</artifactId>
-        <version>6.1.7-hudson-1</version>
+        <groupId>org.jenkins-ci.tools</groupId>
+        <artifactId>maven-jenkins-dev-plugin</artifactId>
+        <version>6.1.26-jenkins-1</version>
         <configuration>
           <contextPath>${contextPath}</contextPath>
+          <!--
+            Reload webapp when you hit ENTER. (See JETTY-282 for more)
+          -->
+          <reload>manual</reload>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
                 <port>${port}</port>
@@ -152,10 +156,6 @@ THE SOFTWARE.
           <!-- use the test classpath for loading resources, since this takes priority -->
           <testClassesDirectory>../core/src/main/resources</testClassesDirectory>
           <useTestClasspath>true</useTestClasspath>
-          <!--
-            Reload webapp when you hit ENTER. (See JETTY-282 for more)
-          -->
-          <consoleForceReload>true</consoleForceReload>
           <userRealms>
             <userRealm implementation="org.mortbay.jetty.security.HashUserRealm">
               <name>default</name>
-- 
GitLab