提交 82ded4d6 编写于 作者: K Kohsuke Kawaguchi

Using the latest Jetty to avoid a race condition that can create

occasional test failures. See JETTY-1149.
上级 39eb87c7
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册