diff options
| author | Markus Koivisto <markus@vaadin.com> | 2014-09-10 12:09:00 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-09-11 05:16:42 +0000 |
| commit | e0f6da4e32b763ac010f8291ab52345a1dd39022 (patch) | |
| tree | 187119adffdb6e04c1a16763885cc1fa0ac0c406 /server/build.xml | |
| parent | bcaa4827f611893d7d86f0ff2347ab6c7552fab7 (diff) | |
| download | vaadin-framework-e0f6da4e32b763ac010f8291ab52345a1dd39022.tar.gz vaadin-framework-e0f6da4e32b763ac010f8291ab52345a1dd39022.zip | |
resolve org.json version conflict between server and shared (#14618)
Change-Id: Iae1723bfcfa56084a1339247b1f82e9277555a5e
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 7bb70ffdc4..9c85736b92 100644 --- a/server/build.xml +++ b/server/build.xml @@ -23,7 +23,7 @@ </union> <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.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.20131108.vaadin1"" /> <property name="server.osgi.require" value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional,com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional" /> <antcall target="common.jar"> <param name="require-bundle" value="${server.osgi.require}" /> |