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 /server/build.xml | |
| 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 'server/build.xml')
| -rw-r--r-- | server/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/build.xml b/server/build.xml index 98ee2342cf..ad377584b9 100644 --- a/server/build.xml +++ b/server/build.xml @@ -24,7 +24,7 @@ <target name="jar"> <property name="server.osgi.import" value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",javax.validation;version="1.0.0.GA";resolution:=optional,org.jsoup;version="1.6.3",org.jsoup.parser;version="1.6.3",org.jsoup.nodes;version="1.6.3",org.jsoup.helper;version="1.6.3",org.jsoup.safety;version="1.6.3",org.json;version="0.0.20080701"" /> - <property name="server.osgi.require" value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional" /> + <property name="server.osgi.require" value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional,com.vaadin.theme-compiler;bundle-version="${vaadin.version}";resolution:=optional" /> <antcall target="common.jar"> <param name="require-bundle" value="${server.osgi.require}" /> <param name="import-package" value="${server.osgi.import}" /> |