From 36121120bb066393ca0a3edd8adfda66c0e0250f Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 12 Aug 2016 13:41:24 +0300
Subject: Make OSGi work again

* Specify correct (Java 8) execution environment for OSGi
* Accept any servlet 3 version

Change-Id: I170d4577218e773bc17c14342bc7f93572932fcc
---
 client/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'client/pom.xml')

diff --git a/client/pom.xml b/client/pom.xml
index 1b2041b8c3..b47cabd15e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -95,8 +95,8 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-						<Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
+						<Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
+						<Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package>
 						<Import-Package></Import-Package>
 					</instructions>
 				</configuration>
-- 
cgit v1.2.3