summaryrefslogtreecommitdiffstats
path: root/shared
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 /shared
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 'shared')
-rw-r--r--shared/pom.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/shared/pom.xml b/shared/pom.xml
index 3ab39b3adb..1fb2144611 100644
--- a/shared/pom.xml
+++ b/shared/pom.xml
@@ -114,9 +114,9 @@
<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}",elemental.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
+ <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
+ <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
+ <Export-Package>com.vaadin.*;version="${osgi.bundle.version}",elemental.*;version="${osgi.bundle.version}"</Export-Package>
<Import-Package></Import-Package>
<Require-Bundle></Require-Bundle>
</instructions>