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

.classpath

@@ -18,15 +18,9 @@
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=client%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=server%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=build.properties"/>
-	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=shared%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=client-compiler%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=build.properties"/>
+	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=build%2Fivy.xml&amp;confs=ide,test&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D"/>
 	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=uitest%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D"/>
-	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=push%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=buildhelpers%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=build.properties"/>
-	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=gwt%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

build/ide.xml

@@ -8,36 +8,23 @@
     <property name="threadsPerProcessor" value="1" />
 
     <target name="resolve" unless="resolve.done">
-        <ivy:resolve log="download-only" file="client-compiler/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="client-compiler.deps" conf="ide" />
-        <ivy:resolve log="download-only" file="server/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="server.deps" conf="ide" />
-        <ivy:resolve log="download-only" file="client/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="client.deps" conf="ide" />
-        <ivy:resolve log="download-only" file="shared/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="shared.deps" conf="ide" />
+        <ivy:resolve log="download-only" file="build/ivy.xml" conf="ide" />
+        <ivy:cachepath pathid="ide.deps" conf="ide" />
         <ivy:resolve log="download-only" file="uitest/ivy.xml" conf="ide" />
         <ivy:cachepath pathid="uitest.deps" conf="ide" />
-        <ivy:resolve log="download-only" file="buildhelpers/ivy.xml" />
-        <ivy:cachepath pathid="buildhelpers.deps" />
-        <ivy:resolve log="download-only" file="gwt/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="gwt.deps" conf="ide" />
 
         <path id="classpath">
             <path location="bin" />
             <path location="build/classes" />
-            <path refid="client-compiler.deps" />
-            <path refid="server.deps" />
-            <path refid="shared.deps" />
-            <path refid="client.deps" />
-            <path refid="buildhelpers.deps" />
-            <path refid="gwt.deps" />
+            <path refid="ide.deps" />
             <path refid="uitest.deps" />
             <path location="server/src/main/java" />
+            <path location="server/src/main/resources" />
             <path location="shared/src/main/java" />
             <path location="shared/src/main/java-templates" />
             <path location="uitest/src" />
             <path location="client/src/main/java" />
+            <path location="client/src/main/resources" />
         </path>
         <property name="resolve.done" value="true" />
     </target>
@@ -72,40 +59,54 @@
             <antcall target="compile-theme" inheritRefs="true">
                 <param name="theme" value="valo" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
                 <param name="theme" value="tests-valo" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
                 <param name="theme" value="tests-valo-dark" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
                 <param name="theme" value="tests-valo-metro" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
                 <param name="theme" value="tests-valo-flat" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
                 <param name="theme" value="tests-valo-flatdark" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
                 <param name="theme" value="tests-valo-facebook" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
                 <param name="theme" value="tests-valo-blueprint" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
               <param name="theme" value="tests-valo-light" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
               <param name="theme" value="tests-valo-disabled-animations" />
             </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
+            <antcall target="compile-test-theme" inheritRefs="true">
               <param name="theme" value="tests-valo-no-font-awesome" />
             </antcall>
         </parallel>
     </target>
 
     <target name="compile-theme" depends="resolve">
+        <java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes">
+            <classpath refid="classpath" />
+            <jvmarg value="-Djava.awt.headless=true" />
+            <arg value="--theme" />
+            <arg value="${theme}" />
+            <arg value="--theme-folder" />
+            <arg value="themes/src/main/resources/VAADIN/themes" />
+            <arg value="--version" />
+            <arg value="${vaadin.version}" />
+        </java>
+
+    </target>
+
+    <target name="compile-test-theme" depends="resolve">
         <java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes">
             <classpath refid="classpath" />
             <jvmarg value="-Djava.awt.headless=true" />

build/ivy.xml

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ivy-module [
+<!-- Keep the version number in sync with push/pom.xml -->
+    <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1">
+
+    <!ENTITY atmosphere.js.version "2.2.13.vaadin3">
+]>
+<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-ide"
+        revision="${vaadin.version}" />
+
+    <configurations>
+        <conf name="build" />
+        <conf name="ide" visibility="private" />
+        <conf name="test" visibility="private" />
+    </configurations>
+    <dependencies>
+
+        <!-- vaadin-client-compiler dependencies -->
+
+        <dependency org="com.vaadin" name="vaadin-sass-compiler"
+            rev="${vaadin.sass.version}" conf="ide->default">
+            <!-- remove cssparser override once sass-compiler is updated -->
+            <exclude name="cssparser" />
+        </dependency>
+
+        <dependency org="commons-collections" name="commons-collections"
+            rev="3.1" conf="ide -> default" />
+        <dependency org="commons-logging" name="commons-logging"
+            rev="1.1.3" conf="ide -> default" />
+
+        <dependency org="ant" name="ant" rev="1.6.5"
+            conf="ide -> default" />
+        <dependency org="net.sourceforge.cssparser" name="cssparser"
+            rev="0.9.11" conf="build,ide -> default" />
+        <dependency org="ant" name="ant-launcher" rev="1.6.5"
+            conf="ide -> default" />
+
+        <dependency org="org.eclipse.jetty" name="jetty-annotations"
+            rev="8.1.12.v20130726" conf="ide -> default">
+            <exclude org="org.eclipse.jetty.orbit"></exclude>
+        </dependency>
+        <dependency org="org.eclipse.jetty" name="jetty-servlets"
+            rev="8.1.12.v20130726" conf="ide -> default">
+            <exclude org="org.eclipse.jetty.orbit"></exclude>
+        </dependency>
+
+        <dependency org="org.eclipse.jetty" name="jetty-util"
+            rev="8.1.12.v20130726" conf="ide -> default" />
+
+        <dependency org="org.jdesktop" name="swing-worker"
+            rev="1.1" conf="ide -> default" />
+        <dependency org="commons-codec" name="commons-codec"
+            rev="1.8" conf="ide -> default" />
+        <dependency org="commons-io" name="commons-io"
+            rev="${commons-io.version}" conf="ide -> default" />
+        <dependency org="org.apache.commons" name="commons-lang3"
+            rev="3.1" conf="ide -> default" />
+        <dependency org="org.apache.james" name="apache-mime4j"
+            rev="0.6" conf="ide -> default" />
+
+        <dependency org="org.apache.httpcomponents" name="httpclient"
+            rev="4.3.1" conf="ide -> default" />
+        <dependency org="org.apache.httpcomponents" name="httpcore"
+            rev="4.3" conf="ide -> default" />
+        <dependency org="org.apache.httpcomponents" name="httpmime"
+            rev="4.3.1" conf="ide -> default" />
+
+        <dependency org="net.sourceforge.nekohtml" name="nekohtml"
+            rev="1.9.19" conf="ide -> default" />
+        <dependency org="xalan" name="serializer" rev="2.7.1"
+            conf="ide -> default" />
+        <dependency org="xerces" name="xercesImpl" rev="2.11.0"
+            conf="ide -> default" />
+        <dependency org="xml-apis" name="xml-apis" rev="1.4.01"
+            conf="ide -> default" />
+
+        <dependency org="com.ibm.icu" name="icu4j" rev="50.1.1"
+            conf="ide -> default" />
+
+        <dependency org="com.vaadin" name="vaadin-client-compiler-deps"
+            rev="1.2.0" conf="ide -> default" />
+
+        <!-- vaadin-server 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" />
+
+        <!-- Jsoup for BootstrapHandler -->
+        <dependency org="org.jsoup" name="jsoup" rev="1.8.3"
+            conf="ide -> default" />
+
+        <!-- vaadin-shared dependencies -->
+
+        <dependency org="com.vaadin.external.flute" name="flute"
+            rev="1.3.0.gg2" conf="ide->default" />
+        <dependency org="com.vaadin.external.streamhtmlparser"
+            name="streamhtmlparser-jsilver" rev="0.0.10.vaadin1"
+            conf="ide->default" />
+        <dependency org="com.vaadin.external.google" name="guava"
+            rev="16.0.1.vaadin1" conf="ide->default" />
+
+        <!-- vaadin-push dependencies -->
+
+        <!-- Atmosphere -->
+        <dependency org="com.vaadin.external.atmosphere"
+            name="atmosphere-runtime" rev="&atmosphere.runtime.version;"
+            conf="ide -> default" />
+        <dependency org="com.vaadin.external.atmosphere.client"
+            name="jquery" rev="&atmosphere.js.version;" conf="ide -> default" />
+
+        <!-- vaadin-buildhelpers dependencies -->
+
+        <dependency org="commons-cli" name="commons-cli" rev="1.2" />
+
+        <!-- Internally used, for now -->
+        <dependency org="com.carrotsearch" name="smartsprites"
+                    rev="0.2.10" />
+
+        <!-- GWT dependencies -->
+
+        <dependency org="com.vaadin.external.gwt" name="gwt-dev" rev="${gwt.version}" conf="ide->default" />
+        <dependency org="com.vaadin.external.gwt" name="gwt-user" rev="${gwt.version}" conf="ide->default" />
+        <dependency org="com.vaadin.external.gwt" name="gwt-codeserver" rev="${gwt.version}" conf="ide->default" />
+        <dependency org="com.vaadin.external.gwt" name="gwt-elemental" rev="${gwt.version}" conf="ide->default" />
+
+        <!-- Testing dependencies -->
+
+        <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="junit" name="junit" rev="4.11"
+            conf="test -> default" />
+        <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="org.hsqldb" name="hsqldb" rev="2.2.6"
+            conf="test -> default" />
+        <dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
+            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" /> -->
+
+        <!-- version overrides -->
+
+        <!-- remove cssparser override once sass-compiler is updated -->
+        <override org="net.sourceforge.cssparser" module="cssparser"
+                  rev="0.9.11" />
+
+    </dependencies>
+
+</ivy-module>

buildhelpers/ivy.xml

@@ -1,37 +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-buildhelpers"
-        revision="${vaadin.version}">
-        <license name="Apache Software License 2.0"
-            url="http://www.apache.org/licenses/LICENSE-2.0" />
-        <ivyauthor name="Vaadin Ltd" url="http://vaadin.com" />
-        <description homepage="http://vaadin.com">
-            Vaadin is a web application
-            framework for Rich Internet Applications (RIA).
-        </description>
-    </info>
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" />
-    </publications>
-    <dependencies>
-        <!-- client-compiler, server and uitest also use commons-io -->
-        <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" />
-        <dependency org="commons-cli" name="commons-cli" rev="1.2" />
-        <dependency org="com.vaadin" name="vaadin-sass-compiler"
-                    rev="${vaadin.sass.version}" />
-
-        <!-- Internally used, for now -->
-        <dependency org="com.carrotsearch" name="smartsprites"
-                    rev="0.2.10" />
-    </dependencies>
-
-</ivy-module>

client-compiled/ivy.xml

@@ -1,32 +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-client-compiled"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="compile-module" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <!-- <artifact type="source" ext="jar" m:classifier="sources" /> -->
-        <!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
-        <artifact type="pom" ext="pom" />
-        <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
-        <!-- <artifact type="jar" name="vaadin-client-compiled-cache"/> -->
-    </publications>
-    <dependencies>
-        <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="compile-module-> default" />
-        <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" conf="compile-module-> default" />
-        <dependency org="com.vaadin" name="vaadin-client-compiler"
-            rev="${vaadin.version}" conf="compile-module-> default" />
-    </dependencies>
-
-</ivy-module>

client-compiler/ivy.xml

@@ -1,106 +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-client-compiler"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" visibility="private" />
-        <conf name="test" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies>
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build -> default" />
-        <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build -> default" />
-        <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" conf="build,test -> default" />
-        <dependency org="com.vaadin" name="vaadin-sass-compiler"
-            rev="${vaadin.sass.version}" conf="build,ide->default">
-            <!-- remove cssparser override once sass-compiler is updated -->
-            <exclude name="cssparser" />
-        </dependency>
-
-        <dependency org="commons-collections" name="commons-collections"
-            rev="3.1" conf="build,ide -> default" />
-        <dependency org="commons-logging" name="commons-logging"
-            rev="1.1.3" conf="build,ide -> default" />
-
-        <dependency org="ant" name="ant" rev="1.6.5"
-            conf="build,ide -> default" />
-        <dependency org="net.sourceforge.cssparser" name="cssparser"
-            rev="0.9.11" conf="build,ide -> default" />
-        <dependency org="ant" name="ant" rev="1.6.5"
-            conf="build,ide -> default" />
-        <dependency org="ant" name="ant-launcher" rev="1.6.5"
-            conf="build,ide -> default" />
-        <dependency org="org.ow2.asm" name="asm"
-            rev="5.0.3" conf="build-> default" />
-        <dependency org="org.ow2.asm" name="asm-util"
-            rev="5.0.3" conf="build-> default" />
-        <dependency org="org.ow2.asm" name="asm-commons"
-            rev="5.0.3" conf="build-> default" />
-
-        <dependency org="org.eclipse.jetty" name="jetty-annotations"
-            rev="8.1.12.v20130726" conf="build,ide -> default">
-            <exclude org="org.eclipse.jetty.orbit"></exclude>
-        </dependency>
-        <dependency org="org.eclipse.jetty" name="jetty-servlets"
-            rev="8.1.12.v20130726" conf="build,ide -> default">
-            <exclude org="org.eclipse.jetty.orbit"></exclude>
-        </dependency>
-
-        <dependency org="org.eclipse.jetty" name="jetty-util"
-            rev="8.1.12.v20130726" conf="build,ide -> default" />
-
-        <dependency org="org.jdesktop" name="swing-worker"
-            rev="1.1" conf="build,ide -> default" />
-        <dependency org="commons-codec" name="commons-codec"
-            rev="1.8" conf="build,ide -> default" />
-        <dependency org="commons-io" name="commons-io"
-            rev="${commons-io.version}" conf="build,ide -> default" />
-        <dependency org="org.apache.commons" name="commons-lang3"
-            rev="3.1" conf="build,ide -> default" />
-        <dependency org="org.apache.james" name="apache-mime4j"
-            rev="0.6" conf="build,ide -> default" />
-
-        <dependency org="org.apache.httpcomponents" name="httpclient"
-            rev="4.3.1" conf="build,ide -> default" />
-        <dependency org="org.apache.httpcomponents" name="httpcore"
-            rev="4.3" conf="build,ide -> default" />
-        <dependency org="org.apache.httpcomponents" name="httpmime"
-            rev="4.3.1" conf="build,ide -> default" />
-
-        <dependency org="net.sourceforge.nekohtml" name="nekohtml"
-            rev="1.9.19" conf="build,ide -> default" />
-        <dependency org="xalan" name="serializer" rev="2.7.1"
-            conf="build,ide -> default" />
-        <dependency org="xerces" name="xercesImpl" rev="2.11.0"
-            conf="build,ide -> default" />
-        <dependency org="xml-apis" name="xml-apis" rev="1.4.01"
-            conf="build,ide -> default" />
-
-        <dependency org="com.ibm.icu" name="icu4j" rev="50.1.1"
-            conf="build,ide -> default" />
-
-        <dependency org="com.vaadin" name="vaadin-client-compiler-deps"
-            rev="1.2.0" conf="build,ide -> default" />
-
-        <dependency org="junit" name="junit" rev="4.11"
-            conf="test,ide -> default" />
-
-
-    </dependencies>
-
-</ivy-module>

client/ivy.xml

@@ -1,21 +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-client"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="ide" visibility="private" />
-    </configurations>
-    <dependencies defaultconf="build" defaultconfmapping="ide->default">
-
-        <!-- Testing dependencies -->
-        <dependency org="org.easymock" name="easymock" rev="3.0"
-            conf="ide-> default" />
-
-    </dependencies>
-
-</ivy-module>

push/ivy.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ivy-module [
-<!-- Keep the version number in sync with build.xml -->
-    <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1">
-
-    <!ENTITY atmosphere.js.version "2.2.13.vaadin3">
-]>
-<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-push" revision="${vaadin.version}" />
-    
-    <configurations>
-        <conf name="ide" visibility="private" />
-    </configurations>
-    
-    <dependencies>
-        <!-- API DEPENDENCIES -->
-
-	    <!-- @WebListener is used for JSR356 websockets so we need to compile with servlet 3 API --> 
-        <dependency org="javax.servlet" name="javax.servlet-api"
-            rev="3.0.1" conf="ide -> default" />
-
-        <!-- Atmosphere -->
-        <dependency org="com.vaadin.external.atmosphere"
-            name="atmosphere-runtime" rev="&atmosphere.runtime.version;"
-            conf="ide -> default" />
-        <dependency org="com.vaadin.external.atmosphere.client"
-            name="jquery" rev="&atmosphere.js.version;" conf="ide -> default" />
-    </dependencies>
-</ivy-module>

server/ivy.xml

@@ -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>

shared/ivy.xml

@@ -1,24 +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-shared"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="ide" visibility="private" />
-    </configurations>
-    
-    <dependencies>
-        <dependency org="com.vaadin.external.flute" name="flute"
-            rev="1.3.0.gg2" conf="ide->default" />
-        <dependency org="com.vaadin.external.streamhtmlparser"
-            name="streamhtmlparser-jsilver" rev="0.0.10.vaadin1"
-            conf="ide->default" />
-        <dependency org="com.vaadin.external.google" name="guava"
-            rev="16.0.1.vaadin1" conf="ide->default" />
-    </dependencies>
-
-</ivy-module>

themes/ivy.xml

@@ -1,35 +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-themes"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="compile-theme" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <!-- <artifact type="source" ext="jar" m:classifier="sources" /> -->
-        <!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies>
-        <dependency org="com.vaadin" name="vaadin-sass-compiler"
-            rev="${vaadin.sass.version}" conf="compile-theme->default" />
-
-        <dependency org="com.vaadin" name="vaadin-buildhelpers"
-                    rev="${vaadin.version}" conf="compile-theme->default">
-            <exclude type="pom" conf="test" />
-        </dependency>
-
-        <!-- remove cssparser override once sass-compiler is updated -->
-        <override org="net.sourceforge.cssparser" module="cssparser"
-                  rev="0.9.11" />
-    </dependencies>
-
-</ivy-module>