diff options
| author | Artur Signell <artur@vaadin.com> | 2012-10-04 08:53:02 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-10-04 11:46:15 +0300 |
| commit | f41265f8bd86d2d17d1f99339314c33d968e77f4 (patch) | |
| tree | ada2e187533d8e6bcf6fc3fe71d46cbd67cb3c49 | |
| parent | 31d542b4bf99ae3a3805b33db94d38b3f4b33d14 (diff) | |
| download | vaadin-framework-f41265f8bd86d2d17d1f99339314c33d968e77f4.tar.gz vaadin-framework-f41265f8bd86d2d17d1f99339314c33d968e77f4.zip | |
Use Flute from vaadin-shared-deps (#9612)
Change-Id: I03ad3d6070d6a87e98f28e5871df36aaf269edb8
| -rw-r--r-- | gwt-files.xml | 7 | ||||
| -rw-r--r-- | theme-compiler/build.xml | 4 | ||||
| -rw-r--r-- | theme-compiler/ivy.xml | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/gwt-files.xml b/gwt-files.xml index 3ca6349dc9..89549f0553 100644 --- 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 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" |