From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 9 Oct 2012 08:22:38 +0000 (+0300)
Subject: Update confs to make jetty classes available for the ProxyTest
X-Git-Tag: 7.0.0.beta6~78^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F82%2F1;p=vaadin-framework.git

Update confs to make jetty classes available for the ProxyTest

Change-Id: Iaa36ad9c5be9b2f4a31812ce129d2c428f677b71
---

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"