diff options
| author | Artur Signell <artur@vaadin.com> | 2012-10-09 09:24:52 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-10-09 11:12:51 +0300 |
| commit | d1962559709a8a5ea0b60ac661bd3a1e0e514be4 (patch) | |
| tree | 800424c611c1875a8484f3ead45a3a8846fc87dd | |
| parent | b7192d23d2390d5165d2cc14470c9a0c835276f0 (diff) | |
| download | vaadin-framework-d1962559709a8a5ea0b60ac661bd3a1e0e514be4.tar.gz vaadin-framework-d1962559709a8a5ea0b60ac661bd3a1e0e514be4.zip | |
Added import package and require bundle definitions (#9793)
Change-Id: I106dc90c30ddac4abf90131824893a4d5d40921f
| -rw-r--r-- | common.xml | 10 | ||||
| -rw-r--r-- | server/build.xml | 3 | ||||
| -rw-r--r-- | shared/build.xml | 3 |
3 files changed, 16 insertions, 0 deletions
diff --git a/common.xml b/common.xml index bd18e7d522..4b86bfaa33 100644 --- a/common.xml +++ b/common.xml @@ -218,6 +218,16 @@ </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> <jar file="${result.jar}" update="true"> 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="1.6.3""/> <antcall target="common.jar"> + <param name="require-bundle" value="com.vaadin.vaadin-shared;version="${vaadin.version}""/> + <param name="import-package" value="javax.servlet;version="2.4.0",${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="20080701"" /> <antcall target="common.jar"> + <param name="require-bundle" value="com.vaadin.shared.deps;version="1.0.0""/> + <param name="import-package" value="${shared.osgi.import}" /> <reference refid="shared.gwt.includes" torefid="extra.jar.includes" /> </antcall> </target> |