diff options
| author | Artur Signell <artur@vaadin.com> | 2012-10-09 09:03:23 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-09 09:03:23 +0000 |
| commit | 88a5e019ab0e545b869852fd37a60654a4927801 (patch) | |
| tree | b44ab6d78addaefac9c29b916177d539daa11c4a | |
| parent | 8a775666ae0459172de4720900285d9067d8a69c (diff) | |
| parent | 66fda4cfd6d5ae410c26bb4895bf0a9a6dc45c9f (diff) | |
| download | vaadin-framework-88a5e019ab0e545b869852fd37a60654a4927801.tar.gz vaadin-framework-88a5e019ab0e545b869852fd37a60654a4927801.zip | |
Merge "Update confs to make jetty classes available for the ProxyTest"
| -rw-r--r-- | uitest/ivy.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/uitest/ivy.xml b/uitest/ivy.xml index ce80832689..04488459f3 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -48,13 +48,14 @@ <!-- Newest Jetty does not work with Ivy currently (orbit -> jar mapping problem) --> <dependency org="org.eclipse.jetty" name="jetty-server" - rev="7.4.5.v20110725" conf="build-provided, ide, jetty-run->default" /> + rev="7.4.5.v20110725" conf="build, ide, jetty-run->default" /> + <!-- jetty-servlets needed in .war by ProxyTest, but not by jetty-runner --> <dependency org="org.eclipse.jetty" name="jetty-servlets" - rev="7.4.5.v20110725" conf="build-provided, ide, jetty-run->default" /> + rev="7.4.5.v20110725" conf="build, ide->default" /> <!-- <dependency org="org.mortbay.jetty" name="jetty-util" --> <!-- rev="8.1.5.v20120716" conf="build,ide,jetty-run->default" /> --> <dependency org="org.eclipse.jetty" name="jetty-webapp" - rev="7.4.5.v20110725" conf="build-provided, ide,jetty-run->default" /> + rev="7.4.5.v20110725" conf="build, ide,jetty-run->default" /> <dependency org="org.mortbay.jetty" name="jetty-runner" rev="7.4.5.v20110725" conf="jetty-run->default" /> <dependency org="junit" name="junit" rev="4.5" |