Merge changes I0cc40f7c,Ia65d8bfb,I03ad3d60

* changes:
  Declared dependencies for jars found in Maven (#9852)
  Use rebased Guava from vaadin-shared-deps (#9612)
  Use Flute from vaadin-shared-deps (#9612)

5 files changed, 39 insertions, 22 deletions

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 3ca6349dc9..40ce86c4e5 100644
--- a/gwt-files.xml
+++ b/gwt-files.xml
@@ -49,15 +49,29 @@
 			<exclude name="license*" />
 			<exclude name="LICENSE*" />
 
-			<!-- Used by client and server apparently... -->
+			<!-- 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 -->
@@ -80,13 +94,6 @@
 		</fileset>
 	</union>
 
-	<union id="theme-compiler.gwt.includes">
-		<!-- This is only temporary. Flute must be packaged separately as it is not in Maven and this version is also modified by the GWT team -->
-		<fileset dir="${gwt.user.jar.files}">
-			<include name="org/w3c/flute/**" />
-		</fileset>
-	</union>
-
 	<union id="client.gwt.includes">
 		<fileset dir="${gwt.user.jar.files}">
 			<exclude name="META-INF/**" />
@@ -117,10 +124,6 @@
 			<include name="com/google/gwt/*/*/shared/**" />
 			<include name="com/google/web/bindery/*/shared/**" />
 		</fileset>
-		<fileset dir="${gwt.dev.jar.files}">
-			<!-- Used by client and server apparently... -->
-			<include name="com/google/gwt/thirdparty/guava/**" />
-		</fileset>
 	</union>
 
 	<union id="server.gwt.includes">
diff --git a/shared/ivy.xml b/shared/ivy.xml
index 2c4b65a389..4cd0df88a1 100644
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -22,6 +22,8 @@
     <dependencies>
         <dependency org="org.json" name="json" rev="20080701"
             conf="build,ide,tests->default" />
+        <dependency org="com.vaadin" name="vaadin-shared-deps"
+            rev="1.0.0" conf="build,ide,tests->default" />
     </dependencies>
 
 </ivy-module>
diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index 33612bef1b..8a36513b71 100644
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -12,8 +12,6 @@
 	<property name="module.name" value="vaadin-theme-compiler" />
 	<property name="result.dir" value="result" />
 	<path id="classpath.compile.custom">
-		<!-- This is only temporary until there is a packaged modified flute jar -->
-		<pathelement path="${gwt.user.jar.files}" />
 	</path>
 	<path id="classpath.tests.custom" />
 
@@ -21,7 +19,7 @@
 
 	<target name="jar">
 		<antcall target="common.jar">
-			<reference torefid="extra.jar.includes" refid="theme-compiler.gwt.includes" />
+			<reference torefid="extra.jar.includes"	refid="empty.reference" />
 		</antcall>
 	</target>
 	<target name="publish-local" depends="jar">
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 76061a9f2b..9423512d50 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -35,10 +35,8 @@
         <dependency org="commons-cli" name="commons-cli" rev="1.2"
             conf="build,ide,tests->default" />
 
-        <!-- FIXME: This should use a repackaged version of flute with included 
-            GWT modifications. Only here to make IDE compilation work atm -->
-        <dependency org="milyn" name="flute" rev="1.3"
-            conf="ide->default" />
+        <dependency org="com.vaadin" name="vaadin-shared-deps" rev="1.0.0"
+            conf="build,ide,tests->default" />
 
         <!-- Provided build libs -->
         <dependency org="javax.servlet" name="servlet-api"