diff options
| author | Artur Signell <artur@vaadin.com> | 2016-08-12 13:41:24 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2016-08-15 15:22:14 +0300 |
| commit | 36121120bb066393ca0a3edd8adfda66c0e0250f (patch) | |
| tree | 3120e06f7a53f34c77a23a9b5ba9f41201060d56 /server/pom.xml | |
| parent | f2bb3c886c0b68c9a4e8212d6625614575148f80 (diff) | |
| download | vaadin-framework-36121120bb066393ca0a3edd8adfda66c0e0250f.tar.gz vaadin-framework-36121120bb066393ca0a3edd8adfda66c0e0250f.zip | |
Make OSGi work again
* Specify correct (Java 8) execution environment for OSGi
* Accept any servlet 3 version
Change-Id: I170d4577218e773bc17c14342bc7f93572932fcc
Diffstat (limited to 'server/pom.xml')
| -rw-r--r-- | server/pom.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/server/pom.xml b/server/pom.xml index c9c435b918..111c7fa996 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -220,11 +220,11 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> - <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package> - <Import-Package>javax.servlet;version="[2.4,${javax.servlet.version}]", - javax.servlet.http;version="[2.4,${javax.servlet.version}]", + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> + <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, org.jsoup;version="${jsoup.version}", org.jsoup.parser;version="${jsoup.version}", @@ -236,8 +236,8 @@ javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional, com.liferay.portal.kernel.util;resolution:=optional</Import-Package> <Require-Bundle> - com.vaadin.shared;bundle-version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", - com.vaadin.push;bundle-version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";resolution:=optional, + com.vaadin.shared;bundle-version="${osgi.bundle.version}", + com.vaadin.push;bundle-version="${osgi.bundle.version}";resolution:=optional, com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional</Require-Bundle> </instructions> </configuration> |