diff options
| author | Mikael Vappula <mikael@vaadin.com> | 2011-12-01 16:48:19 +0200 |
|---|---|---|
| committer | Mikael Vappula <mikael@vaadin.com> | 2011-12-01 16:48:44 +0200 |
| commit | 46309c47b6700127c7aebb68d7fd893b1f0f8429 (patch) | |
| tree | 35ec3c8d68d1d2fd060089ef78feb4d61107a831 /build/ivy/ivy.xml | |
| parent | b41b0a91f6b05dfe25444a9abad8c75537f4c4d2 (diff) | |
| download | vaadin-framework-46309c47b6700127c7aebb68d7fd893b1f0f8429.tar.gz vaadin-framework-46309c47b6700127c7aebb68d7fd893b1f0f8429.zip | |
Ivy configuration and TestBench test build script updates.
Included first version of Ant based replacement of old vaadin-server.py
demo server launch script.
Diffstat (limited to 'build/ivy/ivy.xml')
| -rw-r--r-- | build/ivy/ivy.xml | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/build/ivy/ivy.xml b/build/ivy/ivy.xml index e474e2aab3..6ba0bc840a 100644 --- a/build/ivy/ivy.xml +++ b/build/ivy/ivy.xml @@ -8,7 +8,7 @@ <conf name="client-side.compile" description="Client side compilation dependencies" visibility="private"/> <conf name="test.runtime" description="Test runtime dependencies" visibility="private"/> <conf name="ant-tasks" description="Ant task definitions" visibility="private" /> - <conf name="jetty" description="Embedded Jetty" visibility="private" /> + <conf name="emma" description="Emma code coverage" visibility="private" /> </configurations> <publications /> <dependencies defaultconf="compile" defaultconfmapping="compile->master"> @@ -30,20 +30,12 @@ <!-- GWT dev (incl. servlet-api 2.4 classes) --> <dependency org="com.google.gwt" name="gwt-dev" rev="2.4.0" conf="client-side.compile->master" /> - <!-- Test frameworks & related --> <dependency org="junit" name="junit" rev="4.5" conf="test.runtime ->master"/> <dependency org="org.easymock" name="easymock" rev="3.0" conf="test.runtime ->master"/> <dependency org="asm" name="asm-all" rev="3.3" conf="test.runtime ->master"/> <dependency org="cglib" name="cglib" rev="2.2" conf="test.runtime ->master"/> <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="test.runtime ->master"/> - <dependency org="mysql" name="mysql-connector-java" rev="5.1.10" conf="test.runtime ->master"/> - <dependency org="org.objenesis" name="objenesis" rev="1.2" conf="test.runtime ->master"/> - <dependency org="postgresql" name="postgresql" rev="8.4-701.jdbc3" conf="test.runtime ->master"/> - <!-- - <dependency org="com.oracle" name="ojdbc14" rev="10.2.0.4.0" conf="test.runtime ->master"/> - <dependency org="com.microsoft.sqlserver.jdbc" name="sqljdbc4" rev="2.0" conf="test.runtime ->master"/> - --> <!-- Ant tasks --> <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="ant-tasks ->master"/> @@ -51,15 +43,7 @@ <!-- Emma --> <dependency org="emma" name="emma_ant" rev="2.0.5312" conf="test.runtime,ant-tasks ->master"/> - <dependency org="emma" name="emma" rev="2.0.5312-patched" conf="test.runtime,ant-tasks ->*"/> - - <!-- Jetty --> - <!-- - <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.7" conf="jetty->default" /> - <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.7" conf="jetty->default" /> - <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="6.1.7" conf="jetty->default" /> - --> - + <dependency org="emma" name="emma" rev="2.0.5312-patched" conf="test.runtime,ant-tasks,emma ->*"/> </dependencies> |