diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-31 13:54:26 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-09 11:23:04 +0300 |
| commit | d8a5f96b36946ed315dcf48cc32701e0435bdfaa (patch) | |
| tree | f7fcf075a47430a9f45cfda652d91f576e32c98c /server/ivy.xml | |
| parent | eef56b04b46c6ad202beef58c342dbb5ea0e4f5d (diff) | |
| download | vaadin-framework-d8a5f96b36946ed315dcf48cc32701e0435bdfaa.tar.gz vaadin-framework-d8a5f96b36946ed315dcf48cc32701e0435bdfaa.zip | |
Support running JUnit tests (#9299)
Diffstat (limited to 'server/ivy.xml')
| -rw-r--r-- | server/ivy.xml | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/server/ivy.xml b/server/ivy.xml index 7f964f01f2..85278fa1d0 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -20,49 +20,45 @@ <!-- Liferay Portal Service --> <dependency org="com.liferay.portal" name="portal-service" - rev="6.0.2" conf="build-provided,ide -> master" /> + rev="6.0.2" conf="build-provided,ide -> default" /> <!--Servlet API version 2.5 --> <dependency org="javax.servlet" name="servlet-api" - rev="2.5" conf="build-provided,ide -> master" /> + rev="2.5" conf="build-provided,ide,tests -> default" /> <!--Portlet API version 2.0 (JSR-286) --> <dependency org="javax.portlet" name="portlet-api" - rev="2.0" conf="build-provided,ide -> master" /> + rev="2.0" conf="build-provided,ide,tests -> default" /> <!-- Google App Engine --> <dependency org="com.google.appengine" name="appengine-api-1.0-sdk" - rev="1.2.1" conf="build-provided,ide -> master" /> + rev="1.2.1" conf="build-provided,ide,tests -> default" /> <dependency org="javax.validation" name="validation-api" - rev="1.0.0.GA" conf="build-provided,ide -> master" /> + rev="1.0.0.GA" conf="build-provided,ide,tests -> default" /> <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-shared" - rev="${vaadin.version}" conf="build"></dependency> + rev="${vaadin.version}" conf="build,tests" /> <dependency org="com.vaadin" name="vaadin-buildhelpers" - rev="${vaadin.version}" conf="build"></dependency> + rev="${vaadin.version}" conf="build,tests" /> <!-- Jsoup for BootstrapHandler --> <dependency org="org.jsoup" name="jsoup" rev="1.6.3" - conf="build,ide -> master" /> + conf="build,ide -> default" /> <!-- TESTING DEPENDENCIES --> - <!-- TestBench tests --> - <dependency org="commons-codec" name="commons-codec" - rev="1.5" conf="tests,ide->master" /> - <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.11" - conf="tests,ide->master" /> - <dependency org="org.mortbay.jetty" name="jetty-util" - rev="6.1.11" conf="tests,ide->master" /> - <!-- Test frameworks & related --> <dependency org="junit" name="junit" rev="4.5" - conf="tests,ide -> master" /> + conf="tests,ide -> default" /> <dependency org="org.easymock" name="easymock" rev="3.0" - conf="tests,ide-> master" /> + conf="tests,ide-> default" transitive="true" /> <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" - conf="tests,ide -> master" /> + conf="tests,ide -> default" /> + <dependency org="commons-io" name="commons-io" rev="1.4" + conf="tests->default" /> + <dependency org="commons-lang" name="commons-lang" + rev="2.3" conf="tests->default" /> </dependencies> |