Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Conflicts:
	jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
This commit is contained in:
Jan Bartel 2013-10-14 17:03:02 +11:00
parent a3424532e8 9a330dad1b
commit 278dab08b8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
View File

@ -68,7 +68,7 @@ import org.eclipse.jetty.util.IO;
* </p> * </p>
* *
* @goal run-forked * @goal run-forked
* @requiresDependencyResolution compile+runtime * @requiresDependencyResolution test
* @execute phase="test-compile" * @execute phase="test-compile"
* @description Runs Jetty in forked JVM on an unassembled webapp * @description Runs Jetty in forked JVM on an unassembled webapp
* *