diff options
Diffstat (limited to 'build/ivy.xml')
| -rw-r--r-- | build/ivy.xml | 74 |
1 files changed, 49 insertions, 25 deletions
diff --git a/build/ivy.xml b/build/ivy.xml index 385e2a9da3..79fccc0e54 100644 --- a/build/ivy.xml +++ b/build/ivy.xml @@ -4,6 +4,8 @@ <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1"> <!ENTITY atmosphere.js.version "2.2.13.vaadin3"> + + <!ENTITY jetty.version "8.1.12.v20130726"> ]> <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -16,11 +18,57 @@ <configurations> <conf name="build" /> <conf name="ide" visibility="private" /> - <conf name="test" visibility="private" /> <!-- Dependencies that must be early on the classpath for ide.xml --> <conf name="early" visibility="private" /> </configurations> <dependencies> + <!-- Dependencies from uitest --> + +<!-- + <dependency org="javax.validation" name="validation-api" + rev="1.0.0.GA" conf="ide -> default,sources" /> + <dependency org="javax.servlet" name="javax.servlet-api" + rev="3.0.1" conf="ide -> default" /> + <dependency org="org.eclipse.jetty" name="jetty-server" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.eclipse.jetty" name="jetty-servlets" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.eclipse.jetty" name="jetty-websocket" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.eclipse.jetty" name="jetty-webapp" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.eclipse.jetty" name="jetty-util" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.mortbay.jetty" name="jetty-runner" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="com.jcraft" name="jsch" rev="0.1.52" + conf="ide->default" /> + <dependency org="commons-codec" name="commons-codec" + rev="1.5" conf="ide->default" /> + <dependency org="commons-io" name="commons-io" + rev="${commons-io.version}" conf="ide->default" /> + <dependency org="com.vaadin" name="vaadin-testbench" + rev="4.0.3" conf="ide -> default" /> + <dependency org="commons-lang" name="commons-lang" + rev="2.6" conf="ide -> default" /> + + <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" + rev="3.5.1.201410131835-r" conf="ide->default"> + <exclude org="org.apache.httpcomponents"></exclude> + </dependency> +--> <!-- Vaadin dependencies --> @@ -37,30 +85,6 @@ <dependency org="com.liferay.portal" name="portal-service" rev="6.0.2" conf="ide -> default" /> - <!-- Testing dependencies for Eclipse --> - - <dependency org="junit" name="junit" rev="4.11" - conf="test -> default" /> - - <dependency org="org.easymock" name="easymock" rev="3.0" - conf="test-> default" transitive="true" /> - - <dependency org="org.mockito" name="mockito-all" rev="1.9.5" - conf="test ->default" /> - <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3" - conf="test ->default" /> - <dependency org="commons-lang" name="commons-lang" - rev="2.6" conf="test ->default" /> - <!-- Bean Validation implementation --> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" - conf="test -> default" /> - <dependency org="org.hibernate" name="hibernate-validator" - rev="4.2.0.Final" conf="test -> default" /> - - <!-- For manual testing with PostgreSQL (see SQLTestConstants) --> - <!-- <dependency org="postgresql" name="postgresql" rev="9.1-901.jdbc3" - conf="test->default" /> --> - <!-- Needed by SmartSprites --> <dependency org="com.google.guava" name="guava" rev="14.0.1" conf="early->default" /> |