From: Artur Signell <artur@vaadin.com>
Date: Tue, 9 Oct 2012 06:24:52 +0000 (+0300)
Subject: Added import package and require bundle definitions (#9793)
X-Git-Tag: 7.0.0.beta6~81
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F78%2F3;p=vaadin-framework.git

Added import package and require bundle definitions (#9793)

Change-Id: I106dc90c30ddac4abf90131824893a4d5d40921f
---

diff --git a/common.xml b/common.xml
index bd18e7d522..4b86bfaa33 100644
--- a/common.xml
+++ b/common.xml
@@ -217,6 +217,16 @@
 				</jar>
 			</then>
 		</antcontrib:if>
+		<antcontrib:if>
+			<isset property="require-bundle" />
+			<then>
+				<jar file="${result.jar}" update="true">
+					<manifest>
+						<attribute name="Require-Bundle" value="${require-bundle}" />
+					</manifest>
+				</jar>
+			</then>
+		</antcontrib:if>
 		<antcontrib:if>
 			<isset property="export-package" />
 			<then>
diff --git a/server/build.xml b/server/build.xml
index bf6a3d02e6..50311a18d9 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -22,7 +22,10 @@
 	</union>
 
 	<target name="jar">
+		<property name="server.osgi.import" value="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}" />
 			<reference torefid="extra.jar.includes" refid="jar.includes" />
 		</antcall>
 	</target>
diff --git a/shared/build.xml b/shared/build.xml
index d458b57d71..71276a6b19 100644
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -16,7 +16,10 @@
 
 
 	<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="import-package" value="${shared.osgi.import}" />
 			<reference refid="shared.gwt.includes" torefid="extra.jar.includes" />
 		</antcall>
 	</target>