Fixed typos and added missing import in OSGi requirements (#9793)

 * Import-package: javax.servlet.http
 * Require-bundle should use bundle-version, not version

Change-Id: I100235621de94ee344352c59e6685245c7e21697

diff --git a/server/build.xml b/server/build.xml
index 50311a18d92ef849aa60d9bd752cbd2feac09933..a987ec3846fdf9a44eaf0692c53059e790826117 100644 (file)
--- a/server/build.xml
+++ b/server/build.xml
@@ -22,10 +22,10 @@
        </union>
 
        <target name="jar">
-               <property name="server.osgi.import" value="org.jsoup;version=&quot;1.6.3&quot;"/>
+               <property name="server.osgi.import" value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,org.jsoup;version=&quot;1.6.3&quot;"/>
                <antcall target="common.jar">
-                       <param name="require-bundle" value="com.vaadin.vaadin-shared;version=&quot;${vaadin.version}&quot;"/>
-                       <param name="import-package" value="javax.servlet;version=&quot;2.4.0&quot;,${server.osgi.import}" />
+                       <param name="require-bundle" value="com.vaadin.vaadin-shared;bundle-version=&quot;${vaadin.version}&quot;"/>
+                       <param name="import-package" value="${server.osgi.import}" />
                        <reference torefid="extra.jar.includes" refid="jar.includes" />
                </antcall>
        </target>

diff --git a/shared/build.xml b/shared/build.xml
index 71276a6b19b635ae259e13093fe60056f1d1847b..ecc00c978283713f4c7b2d9481f511dd62e5100d 100644 (file)
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -18,7 +18,7 @@
        <target name="jar">
                <property name="shared.osgi.import" value="org.json;version=&quot;20080701&quot;" />
                <antcall target="common.jar">
-                       <param name="require-bundle" value="com.vaadin.shared.deps;version=&quot;1.0.0&quot;"/>
+                       <param name="require-bundle" value="com.vaadin.shared.deps;bundle-version=&quot;1.0.0&quot;"/>
                        <param name="import-package" value="${shared.osgi.import}" />
                        <reference refid="shared.gwt.includes" torefid="extra.jar.includes" />
                </antcall>