diff options
| author | Artur Signell <artur@vaadin.com> | 2012-10-09 10:55:39 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-09 10:55:39 +0000 |
| commit | f9c3557c54d85f31d1d2ab8b9f2ffd71fd81ccf6 (patch) | |
| tree | a691c610c3850e6458a3767b7cb439e8097c8ed9 | |
| parent | 2bced3979f169a415756952f70e05c13d8d31cb7 (diff) | |
| parent | e20772e625a0cb06dbe81d6241217d14ba92012c (diff) | |
| download | vaadin-framework-f9c3557c54d85f31d1d2ab8b9f2ffd71fd81ccf6.tar.gz vaadin-framework-f9c3557c54d85f31d1d2ab8b9f2ffd71fd81ccf6.zip | |
Merge "Fixed typos and added missing import in OSGi requirements (#9793) * Import-package: javax.servlet.http * Require-bundle should use bundle-version, not version"
| -rw-r--r-- | server/build.xml | 6 | ||||
| -rw-r--r-- | shared/build.xml | 2 |
2 files changed, 4 insertions, 4 deletions
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="1.6.3""/> + <property name="server.osgi.import" value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",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}" /> + <param name="require-bundle" value="com.vaadin.vaadin-shared;bundle-version="${vaadin.version}""/> + <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="20080701"" /> <antcall target="common.jar"> - <param name="require-bundle" value="com.vaadin.shared.deps;version="1.0.0""/> + <param name="require-bundle" value="com.vaadin.shared.deps;bundle-version="1.0.0""/> <param name="import-package" value="${shared.osgi.import}" /> <reference refid="shared.gwt.includes" torefid="extra.jar.includes" /> </antcall> |