Use Flute from vaadin-shared-deps (#9612)

Change-Id: I03ad3d6070d6a87e98f28e5871df36aaf269edb8

diff --git a/gwt-files.xml b/gwt-files.xml
index 3ca6349dc925b6ba15c28ae3befa45f43c4b1a4b..89549f05532c44bcad18e5db412d62bace83b418 100644 (file)
--- a/gwt-files.xml
+++ b/gwt-files.xml
@@ -80,13 +80,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/**" />

diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index 33612bef1bbc8e506a19e970d8d1db8a5684dc31..8a36513b7124d90247b9a6e0ff94be922246770a 100644 (file)
--- 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 76061a9f2b29674774a167500d014f5291a0718b..9423512d509dfff6cd6e018b03f89a64118b3071 100644 (file)
--- 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"