diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-02-12 14:57:13 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-02-19 15:19:46 +0200 |
| commit | fd8078d691f6b6eec407882280730104f5027e3d (patch) | |
| tree | 1e9e3dac572d9951a55d6d00e935167c6056eb27 /uitest/ivy.xml | |
| parent | f4e002e36be983b16c6324255780fd7e74710d68 (diff) | |
| download | vaadin-framework-fd8078d691f6b6eec407882280730104f5027e3d.tar.gz vaadin-framework-fd8078d691f6b6eec407882280730104f5027e3d.zip | |
Use TestBench-4.0.2
- Based on TB4 Parallel testing.
- Browser setup no longer uses static capabilities.
- Some code cleanup here and there.
Change-Id: I5c419316cd36f4f5041eaa8da8fda3d8b46596c4
Diffstat (limited to 'uitest/ivy.xml')
| -rw-r--r-- | uitest/ivy.xml | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 78171f9a9c..9c4db1584b 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE ivy-module [ - <!ENTITY jetty.version "8.1.9.v20130131"> + <!ENTITY jetty.version "8.1.12.v20130726"> ]> <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -28,7 +28,7 @@ <dependency org="javax.validation" name="validation-api" rev="1.0.0.GA" conf="build,ide -> default,sources" /> <dependency org="org.hibernate" name="hibernate-validator" - rev="4.2.0.Final" conf="build,ide -> default" /> + rev="4.2.0.Final" conf="build,ide -> default" /> <!-- Google App Engine --> <dependency org="com.google.appengine" name="appengine-api-1.0-sdk" rev="1.2.1" conf="build-provided,ide -> default" /> @@ -74,11 +74,17 @@ </dependency> <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> <dependency org="org.eclipse.jetty" name="jetty-servlets" - rev="&jetty.version;" conf="ide, build-provided, jetty-run->default" /> + rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> <dependency org="org.eclipse.jetty" name="jetty-websocket" - rev="&jetty.version;" conf="ide, jetty-run->default" /> + rev="&jetty.version;" conf="ide, jetty-run->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> <dependency org="org.eclipse.jetty" name="jetty-webapp" - rev="&jetty.version;" conf="ide, build-provided, jetty-run->default" /> + rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> <dependency org="org.mortbay.jetty" name="jetty-runner" rev="&jetty.version;" conf="ide, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> @@ -86,31 +92,33 @@ <dependency org="junit" name="junit" rev="4.11" conf="build,ide -> default" /> - <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3" - conf="build,ide->default" /> + <dependency org="org.hamcrest" name="hamcrest-all" + rev="1.3" conf="build,ide->default" /> <dependency org="com.jcraft" name="jsch" rev="0.1.50" conf="ide, build->default" /> <dependency org="commons-codec" name="commons-codec" rev="1.5" conf="build,ide->default" /> - <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" - conf="build,ide->default" /> + <dependency org="commons-io" name="commons-io" + rev="${commons-io.version}" conf="build,ide->default" /> <!-- Mainly for SQLContainer tests --> <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="build,ide -> default" /> <dependency org="com.vaadin" name="vaadin-testbench" - rev="4.0.0.alpha1" conf="build-provided,ide -> default" /> + rev="4.0.2" conf="build-provided,ide -> default" /> <!-- This should be removed once tests have been updated to use lang3 --> <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="build,ide -> default" /> - <dependency org="com.vaadin" name="vaadin-sass-compiler" + <dependency org="com.vaadin" name="vaadin-sass-compiler" rev="${vaadin.sass.version}" conf="compile-theme->default" /> <dependency org="com.vaadin" name="vaadin-buildhelpers" - rev="${vaadin.version}" conf="compile-theme->build" /> + rev="${vaadin.version}" conf="compile-theme->build" /> - <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" - rev="3.5.1.201410131835-r" conf="ide,build->default" /> + <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" + rev="3.5.1.201410131835-r" conf="ide,build->default"> + <exclude org="org.apache.httpcomponents"></exclude> + </dependency> </dependencies> |