diff options
| author | Maciej Przepióra <matthew@vaadin.com> | 2014-10-23 18:07:20 +0300 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-10-29 10:49:08 +0200 |
| commit | 4c637047d39328c9088f6ef944638f9ece76957b (patch) | |
| tree | 0d25353fd29b150ee23048f8a3696e500d4e4aec /server | |
| parent | 7fc8ce1f25db90973b12dd9569bdb42407be4a90 (diff) | |
| download | vaadin-framework-4c637047d39328c9088f6ef944638f9ece76957b.tar.gz vaadin-framework-4c637047d39328c9088f6ef944638f9ece76957b.zip | |
Set correct versions for json package imports in OSGi manfiests (#14618)
Change-Id: I4761ab889bfacedd66bd7ed5f37fe763d7539bef
Diffstat (limited to 'server')
| -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 9c85736b92..7bb70ffdc4 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.20131108.vaadin1"" /> + <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,com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional" /> <antcall target="common.jar"> <param name="require-bundle" value="${server.osgi.require}" /> |