From: Artur Signell <artur@vaadin.com>
Date: Thu, 4 Oct 2012 13:20:06 +0000 (+0300)
Subject: Declared dependencies for jars found in Maven (#9852)
X-Git-Tag: 7.0.0.beta6~96^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ed0d461591780c6f2d60dc6b8aa878fbba6cf197;p=vaadin-framework.git

Declared dependencies for jars found in Maven (#9852)

Change-Id: I0cc40f7c10c1dc6a1dcaff48e86d04079c1f70ae
---

diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index 777236ee53..e84657c3bf 100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -29,6 +29,22 @@
             rev="3.1" 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.5" />
+        <dependency org="ant" name="ant" rev="1.6.5" />
+        <dependency org="ant" name="ant-launcher" rev="1.6.5" />
+        <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.11" />
+        <dependency org="org.mortbay.jetty" name="jetty-util"
+            rev="6.1.11" />
+        <dependency org="org.jdesktop" name="swing-worker"
+            rev="1.1" />
+        <dependency org="commons-codec" name="commons-codec"
+            rev="1.3" />
+        <dependency org="commons-io" name="commons-io" rev="1.4" />
+        <dependency org="commons-lang" name="commons-lang"
+            rev="2.6" />
+        <dependency org="org.apache.james" name="apache-mime4j"
+            rev="0.6" />
     </dependencies>
 
 </ivy-module>
diff --git a/gwt-files.xml b/gwt-files.xml
index b25a30e00c..40ce86c4e5 100644
--- a/gwt-files.xml
+++ b/gwt-files.xml
@@ -49,15 +49,29 @@
 			<exclude name="license*" />
 			<exclude name="LICENSE*" />
 
-			<!-- Package in vaadin-shared-deps.jar -->
+			<!-- Packages in vaadin-shared-deps.jar or declared
+			as dependencies -->
 			<exclude name="com/google/gwt/thirdparty/guava/**" />
+			<exclude name="javax/servlet/**" />
+			<exclude name="javax/xml/**" />
+			<!-- cssparser -->
+			<exclude name="com/steadystate/css/**" />
+			<!-- Ant & AntLauncher -->
+			<exclude name="org/apache/tools/**"/>
+			<!-- Jetty & jetty-util -->
+			<exclude name="org/mortbay/**"/>
+			<!-- Swing Worker-->
+			<exclude name="org/jdesktop/swingworker/**"/>
+			<!-- Apache commons codec & io & lang -->
+			<exclude name="org/apache/commons/codec/**"/>
+			<exclude name="org/apache/commons/io/**"/>
+			<exclude name="org/apache/commons/lang/**"/>
+			<!-- apache mime4j -->
+			<exclude name="org/apache/james/mime4j/**"/>
 
 			<!-- Overridden in Vaadin -->
 			<exclude name="com/google/gwt/dev/About.properties" />
 
-			<!-- external dependencies declared in ixy.xml/pom.xml -->
-			<exclude name="javax/servlet/**" />
-			<exclude name="javax/xml/**" />
 		</fileset>
 
 		<!-- GWT SuperDevMode -->