diff options
author | Henri Sara <hesara@vaadin.com> | 2016-04-02 14:34:05 +0300 |
---|---|---|
committer | Henri Sara <hesara@vaadin.com> | 2016-04-02 14:44:21 +0300 |
commit | c2afd4339ae1c8158171da93744abc2c27e2cbf4 (patch) | |
tree | 07f616efefffd549ed64a9b907dd5d359479700a /server/ivy.xml | |
parent | 009efc50ec48ad97f991ba1e65424c05c6b3b1fb (diff) | |
download | vaadin-framework-c2afd4339ae1c8158171da93744abc2c27e2cbf4.tar.gz vaadin-framework-c2afd4339ae1c8158171da93744abc2c27e2cbf4.zip |
Remove most Ivy files
Consolidate Ivy dependencies for Eclipse and ide.xml in one location
and remove redundant ivy.xml files.
This also fixes some theme and resource paths in ide.xml but does not
fully fix test theme compilation.
Change-Id: If44c73d7f85d02ebef379aa306e6e284fe7446c1
Diffstat (limited to 'server/ivy.xml')
-rw-r--r-- | server/ivy.xml | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/server/ivy.xml b/server/ivy.xml deleted file mode 100644 index 05af3528c0..0000000000 --- a/server/ivy.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" - xmlns:m="http://ant.apache.org/ivy/maven"> - - <info organisation="com.vaadin" module="vaadin-server" - revision="${vaadin.version}" /> - - <configurations> - <conf name="ide" visibility="private" /> - </configurations> - - <dependencies> - <!-- API DEPENDENCIES --> - - <!-- Liferay Portal Service --> - <dependency org="com.liferay.portal" name="portal-service" - rev="6.0.2" conf="ide -> default" /> - - <!--Servlet API version 3.0 --> - <dependency org="javax.servlet" name="javax.servlet-api" - rev="3.0.1" conf="ide -> default" /> - - <!--Portlet API version 2.0 (JSR-286) --> - <dependency org="javax.portlet" name="portlet-api" - rev="2.0" conf="ide -> default" /> - - <!-- Google App Engine --> - <dependency org="com.google.appengine" name="appengine-api-1.0-sdk" - rev="1.7.7" conf="ide -> default" /> - - <!-- Bean Validation API --> - <dependency org="javax.validation" name="validation-api" - rev="1.0.0.GA" conf="ide -> default" /> - - <!-- Sass compiler --> - <dependency org="com.vaadin" name="vaadin-sass-compiler" - rev="${vaadin.sass.version}" conf="ide ->default"> - <exclude type="pom" conf="ide" /> - </dependency> - - <!-- Jsoup for BootstrapHandler --> - <dependency org="org.jsoup" name="jsoup" rev="1.8.3" - conf="ide -> default" /> - - <!-- TESTING DEPENDENCIES --> - - <!-- Test frameworks & related --> - <dependency org="junit" name="junit" rev="4.11" - conf="ide -> default" /> - <dependency org="org.mockito" name="mockito-all" rev="1.9.5" - conf="ide ->default" /> - <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3" - conf="ide ->default" /> - <dependency org="org.easymock" name="easymock" rev="3.0" - conf="ide -> default" transitive="true" /> - <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" - conf="ide -> default" /> - <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" - conf="ide->default" /> - <dependency org="commons-lang" name="commons-lang" - rev="2.6" conf="ide ->default" /> - <!-- Bean Validation implementation --> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" - conf="ide -> default" /> - <dependency org="org.hibernate" name="hibernate-validator" - rev="4.2.0.Final" conf="ide -> default" /> - - <!-- For manual testing with PostgreSQL (see SQLTestConstants) --> - <!-- <dependency org="postgresql" name="postgresql" rev="9.1-901.jdbc3" - conf="ide" /> --> - - <!-- remove cssparser override once sass-compiler is updated --> - <override org="net.sourceforge.cssparser" module="cssparser" - rev="0.9.11" /> - </dependencies> - -</ivy-module> |