diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-04 14:49:30 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-09 11:23:12 +0300 |
| commit | b2b384b531eff28e1fe33bdb91f77edd509970a8 (patch) | |
| tree | d3c4cfb8bf30388b5fa985ce3f265da07503e097 /uitest/ivy.xml | |
| parent | f73ff78c95ef6184e8365ada272bbbc147bdcd10 (diff) | |
| download | vaadin-framework-b2b384b531eff28e1fe33bdb91f77edd509970a8.tar.gz vaadin-framework-b2b384b531eff28e1fe33bdb91f77edd509970a8.zip | |
Support running TestBench tests with the vaadin-uitest war (#9299)
Server is now launched using jetty-runner instead of a custom DemoLauncher
Diffstat (limited to 'uitest/ivy.xml')
| -rw-r--r-- | uitest/ivy.xml | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/uitest/ivy.xml b/uitest/ivy.xml index b243dfd8ec..5dbb5dd6fc 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -8,7 +8,9 @@ <configurations> <conf name="build" /> + <conf name="build-provided" visibility="private" /> <conf name="ide" visibility="private" /> + <conf name="jetty-run" extends="build" visibility="private" /> </configurations> <publications> <artifact type="war" /> @@ -16,16 +18,16 @@ <dependencies defaultconf="build" defaultconfmapping="build,ide->default"> <!-- API DEPENDENCIES --> <dependency org="javax.portlet" name="portlet-api" - rev="2.0" conf="build,ide -> default" /> + rev="2.0" conf="build-provided,ide -> default" /> <dependency org="javax.validation" name="validation-api" rev="1.0.0.GA" conf="build,ide -> default" /> <!--Servlet API version 2.5 --> <dependency org="javax.servlet" name="servlet-api" - rev="2.5" conf="build,ide -> default" /> + rev="2.5" conf="build-provided,ide -> default" /> <!-- Google App Engine --> <dependency org="com.google.appengine" name="appengine-api-1.0-sdk" - rev="1.2.1" conf="build,ide -> default" /> + rev="1.2.1" conf="build-provided,ide -> default" /> <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> @@ -38,10 +40,16 @@ <dependency org="com.vaadin" name="vaadin-themes-compiled" rev="${vaadin.version}" conf="build->build"></dependency> - <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.11" - conf="build,ide->default" /> - <dependency org="org.mortbay.jetty" name="jetty-util" - rev="6.1.11" conf="build,ide->default" /> + <!-- 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" /> + <!-- <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" /> + <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" conf="build,ide -> default" /> |