Merge remote-tracking branch 'origin/master' into jetty-9.1

Conflicts: jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
2013-10-14 17:03:02 +11:00 · 2013-10-14 17:03:02 +11:00 · 278dab08b8
parent a3424532e8 9a330dad1b
commit 278dab08b8
1 changed files with 1 additions and 1 deletions
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
@ -68,7 +68,7 @@ import org.eclipse.jetty.util.IO;
 *  </p>
 * 
 * @goal run-forked
- * @requiresDependencyResolution compile+runtime
+ * @requiresDependencyResolution test
 * @execute phase="test-compile"
 * @description Runs Jetty in forked JVM on an unassembled webapp
 *