diff options
| author | Henri Sara <hesara@vaadin.com> | 2013-04-30 11:37:41 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2013-04-30 11:37:41 +0300 |
| commit | 329b899bc1eec885c76c63ccb0706a2367a2a5b5 (patch) | |
| tree | faa914dd781ebbc6e2593def258934c072c1ae4e /uitest | |
| parent | a430180f6fee1073ac7952e5f0c6bd7a01ed6606 (diff) | |
| download | vaadin-framework-329b899bc1eec885c76c63ccb0706a2367a2a5b5.tar.gz vaadin-framework-329b899bc1eec885c76c63ccb0706a2367a2a5b5.zip | |
Remove Jetty JARs from uitest WAR (related to #11688)
Otherwise, Atmosphere may auto-detect Jetty at least on some
other servers.
Change-Id: I12552af49bb07ee84705b785abb2bef53f9278ed
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/ivy.xml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 3c5e08a3cf..41166c1b22 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -50,18 +50,17 @@ <!-- Newest Jetty does not work with Ivy currently (orbit -> jar mapping problem) --> <dependency org="org.eclipse.jetty" name="jetty-server" - rev="7.5.0.v20110901" conf="build, ide, jetty-run->default" /> - <!-- jetty-servlets needed in .war by ProxyTest, but not by jetty-runner --> + rev="7.5.0.v20110901" conf="ide, jetty-run->default" /> + <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> <dependency org="org.eclipse.jetty" name="jetty-servlets" - rev="7.5.0.v20110901" conf="build, ide->default" /> + rev="7.5.0.v20110901" conf="ide, jetty-run->default" /> <dependency org="org.eclipse.jetty" name="jetty-websocket" - rev="7.5.0.v20110901" conf="build, ide->default" /> - <!-- <dependency org="org.mortbay.jetty" name="jetty-util" --> - <!-- rev="8.1.5.v20120716" conf="build,ide,jetty-run->default" /> --> + rev="7.5.0.v20110901" conf="ide, jetty-run->default" /> <dependency org="org.eclipse.jetty" name="jetty-webapp" - rev="7.5.0.v20110901" conf="build, ide,jetty-run->default" /> + rev="7.5.0.v20110901" conf="ide, jetty-run->default" /> <dependency org="org.mortbay.jetty" name="jetty-runner" rev="7.5.0.v20110901" conf="jetty-run->default" /> + <dependency org="junit" name="junit" rev="4.5" conf="build,ide -> default" /> |