diff options
| author | Artur Signell <artur@vaadin.com> | 2015-01-27 09:19:44 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-01-27 09:41:41 +0200 |
| commit | 627c4c40997148f2c55ff7f533669a4284fbba2d (patch) | |
| tree | b31ba36815d780acfb1d9dc1d6859fd6e648091e /server/build.xml | |
| parent | 189d104051c00b9aea9f7b9e27e0a4e68a408ae5 (diff) | |
| download | vaadin-framework-627c4c40997148f2c55ff7f533669a4284fbba2d.tar.gz vaadin-framework-627c4c40997148f2c55ff7f533669a4284fbba2d.zip | |
Use elemental.json and not org.json in OSGi (#16490)
Change-Id: Ib11880b020f0f60c9e0808409d243e6c4d6c05aa
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 798058b88b..c658ab0336 100644 --- a/server/build.xml +++ b/server/build.xml @@ -26,7 +26,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"" /> + 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"" /> <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"> |