From: Artur Signell <artur@vaadin.com>
Date: Tue, 9 Oct 2012 10:24:38 +0000 (+0300)
Subject: Fixed typos and added missing import in OSGi requirements (#9793)
X-Git-Tag: 7.0.0.beta6~72^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F88%2F2;p=vaadin-framework.git

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 50311a18d9..a987ec3846 100644
--- 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 71276a6b19..ecc00c9782 100644
--- 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>