diff options
author | Build Agent <build@vaadin.com> | 2014-02-27 13:14:00 +0200 |
---|---|---|
committer | Build Agent <build@vaadin.com> | 2014-02-27 13:14:01 +0200 |
commit | 45bae7affeeb1feb9da1857f73b17cdc363d25d2 (patch) | |
tree | a9cb764f1bb0d7bf663d2687613e9bf466694a1b /theme-compiler | |
parent | ca9f91d8b537f5cf3e0694cbb538052c2a25f608 (diff) | |
parent | fbce1270b1ea9260a6bb1842f5a5747d173b6f0a (diff) | |
download | vaadin-framework-45bae7affeeb1feb9da1857f73b17cdc363d25d2.tar.gz vaadin-framework-45bae7affeeb1feb9da1857f73b17cdc363d25d2.zip |
Merge changes from origin/7.1
badf9f2 Do not prevent deployment if Atmosphere init fails (#13199)
be827f8 Enable on-the-fly SASS compilation in OSGi (#10307)
61a1899 Fix SQLContainer paging and caching issue (#11199)
19dde49 Remove applet test which does not work reliably
a73c9ef Fix broken TableScrollingWithSQLContainer test UI
fbce127 Use Chrome 33 for testing
Change-Id: I4a09cdfcc8187604a24391a73ea6c04c6d50bb5f
Diffstat (limited to 'theme-compiler')
-rw-r--r-- | theme-compiler/build.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml index aed0f91fbb..dbdc7e3e80 100644 --- a/theme-compiler/build.xml +++ b/theme-compiler/build.xml @@ -53,6 +53,7 @@ <target name="jar" depends="parser"> <antcall target="common.jar"> + <param name="import-package" value="org.apache.commons.jexl2;version="2.1.1",org.w3c.css.sac;version="1.3",org.w3c.flute.parser;version="1.3.0.gg2",org.w3c.flute.parser.selectors;version="1.3.0.gg2",org.w3c.flute.util;version="1.3.0.gg2"" /> <reference torefid="extra.jar.includes" refid="empty.reference" /> </antcall> </target> |