diff options
| author | Henri Sara <henri.sara@gmail.com> | 2017-01-10 15:57:53 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2017-01-10 15:57:53 +0200 |
| commit | aae36190f7647dc773c7410f68f41b731c937d97 (patch) | |
| tree | 910103f715bcc024b916a4caabc5714f59adad58 /server/pom.xml | |
| parent | ae54094346c40be3a058e41c942236383362ffd0 (diff) | |
| download | vaadin-framework-aae36190f7647dc773c7410f68f41b731c937d97.tar.gz vaadin-framework-aae36190f7647dc773c7410f68f41b731c937d97.zip | |
Fix OSGi configuration for Liferay 7 (#8204)
* Fix OSGi configuration for Liferay 7
Diffstat (limited to 'server/pom.xml')
| -rw-r--r-- | server/pom.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/pom.xml b/server/pom.xml index 07da0ff9fb..0bd86a3e2f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -183,6 +183,7 @@ <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> <Bundle-Version>${osgi.bundle.version}</Bundle-Version> <Export-Package>VAADIN;version="${osgi.bundle.version}",com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> + <!-- Note that Liferay 6 does not use OSGi, and the dependency is optional for non-Liferay deployments --> <Import-Package>javax.servlet;version="${osgi.javax.servlet.version}", javax.servlet.http;version="${osgi.javax.servlet.version}", javax.validation;version="${javax.validation.version}";resolution:=optional, @@ -194,7 +195,7 @@ org.jsoup.select;version="${jsoup.version}", javax.portlet;version="[${javax.portlet.version},3)";resolution:=optional, javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional, - com.liferay.portal.kernel.util;resolution:=optional</Import-Package> + com.liferay.portal.kernel.util;version="[7,8)";resolution:=optional</Import-Package> <Require-Bundle> com.vaadin.shared;bundle-version="${osgi.bundle.version}", com.vaadin.push;bundle-version="${osgi.bundle.version}";resolution:=optional, |