Added import package and require bundle definitions (#9793)

Change-Id: I106dc90c30ddac4abf90131824893a4d5d40921f

diff --git a/common.xml b/common.xml
index bd18e7d522134421407fd60046bcdd935fae7054..4b86bfaa331b28f276a938774630baf5f0bfa672 100644 (file)
--- 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 bf6a3d02e6f41c8b7b83a5e02158a20ab049d3a6..50311a18d92ef849aa60d9bd752cbd2feac09933 100644 (file)
--- 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 d458b57d71998f6ede60fad05b6c1636816c2f16..71276a6b19b635ae259e13093fe60056f1d1847b 100644 (file)
--- 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>