summaryrefslogtreecommitdiffstats
path: root/uitest/ivy.xml
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-10-09 11:22:38 +0300
committerLeif Åstrand <leif@vaadin.com>2012-10-09 11:29:43 +0300
commit66fda4cfd6d5ae410c26bb4895bf0a9a6dc45c9f (patch)
tree2c4b4ea15e57932e62c6e629497c297f1f10a44e /uitest/ivy.xml
parent83ab152906251ded4e3c46e9f3e0e5bd790124f4 (diff)
downloadvaadin-framework-66fda4cfd6d5ae410c26bb4895bf0a9a6dc45c9f.tar.gz
vaadin-framework-66fda4cfd6d5ae410c26bb4895bf0a9a6dc45c9f.zip
Update confs to make jetty classes available for the ProxyTest
Change-Id: Iaa36ad9c5be9b2f4a31812ce129d2c428f677b71
Diffstat (limited to 'uitest/ivy.xml')
-rw-r--r--uitest/ivy.xml7
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"