summaryrefslogtreecommitdiffstats
path: root/client-compiled
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-08-12 13:41:24 +0300
committerArtur Signell <artur@vaadin.com>2016-08-15 15:22:14 +0300
commit36121120bb066393ca0a3edd8adfda66c0e0250f (patch)
tree3120e06f7a53f34c77a23a9b5ba9f41201060d56 /client-compiled
parentf2bb3c886c0b68c9a4e8212d6625614575148f80 (diff)
downloadvaadin-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 'client-compiled')
-rw-r--r--client-compiled/pom.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml
index 97fd8fa575..e8673d6e7f 100644
--- a/client-compiled/pom.xml
+++ b/client-compiled/pom.xml
@@ -110,8 +110,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+ <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
<!-- Export package is handled in exec plugin -->
<Export-Package></Export-Package>
<Import-Package></Import-Package>