summaryrefslogtreecommitdiffstats
path: root/server/build.xml
diff options
context:
space:
mode:
authorMaciej PrzepioĢra <matthew@vaadin.com>2014-10-23 18:07:20 +0300
committerVaadin Code Review <review@vaadin.com>2014-10-27 10:28:24 +0000
commiteeec83d56b663c030672aa596150f4a5b1948554 (patch)
treebfd2d3611ad3c6fd3145640245f59ad0ebc83119 /server/build.xml
parent949215f3d89485d02a57bebdd45d7ea2904e28e1 (diff)
downloadvaadin-framework-eeec83d56b663c030672aa596150f4a5b1948554.tar.gz
vaadin-framework-eeec83d56b663c030672aa596150f4a5b1948554.zip
Set correct versions for json package imports in OSGi manfiests (#14618)
Change-Id: I4761ab889bfacedd66bd7ed5f37fe763d7539bef
Diffstat (limited to 'server/build.xml')
-rw-r--r--server/build.xml2
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=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,javax.validation;version=&quot;1.0.0.GA&quot;;resolution:=optional,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;,org.json;version=&quot;0.0.20131108.vaadin1&quot;" />
+ <property name="server.osgi.import" value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,javax.validation;version=&quot;1.0.0.GA&quot;;resolution:=optional,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;,org.json;version=&quot;0.0.20080701&quot;" />
<property name="server.osgi.require" value="com.vaadin.shared;bundle-version=&quot;${vaadin.version}&quot;,com.vaadin.push;bundle-version=&quot;${vaadin.version}&quot;;resolution:=optional,com.vaadin.sass-compiler;bundle-version=&quot;${vaadin.sass.version}&quot;;resolution:=optional" />
<antcall target="common.jar">
<param name="require-bundle" value="${server.osgi.require}" />