summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-04 14:49:30 +0300
committerArtur Signell <artur@vaadin.com>2012-09-09 11:23:12 +0300
commitb2b384b531eff28e1fe33bdb91f77edd509970a8 (patch)
treed3c4cfb8bf30388b5fa985ce3f265da07503e097 /build
parentf73ff78c95ef6184e8365ada272bbbc147bdcd10 (diff)
downloadvaadin-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 'build')
-rw-r--r--build/ivy/ivy.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/build/ivy/ivy.xml b/build/ivy/ivy.xml
index 4231633e98..df30458e25 100644
--- a/build/ivy/ivy.xml
+++ b/build/ivy/ivy.xml
@@ -44,10 +44,6 @@
<dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.0.10" conf="taskdefs ->master"/>
<dependency org="com.googlecode.jarjar" name="jarjar" rev="1.3" conf="taskdefs ->master"/>
- <!-- Emma -->
- <dependency org="emma" name="emma_ant" rev="2.0.5312" conf="server.tests.extdep,taskdefs ->master"/>
- <dependency org="emma" name="emma" rev="2.0.5312-patched" conf="server.tests.extdep,taskdefs ->*"/>
-
<!-- Bean Validation implementation -->
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="server.tests.extdep -> default"/>
<dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="server.tests.extdep -> default"/>