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 /client-compiler | |
| 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 'client-compiler')
| -rw-r--r-- | client-compiler/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml index 053a84e496..72e794118c 100644 --- a/client-compiler/pom.xml +++ b/client-compiler/pom.xml @@ -88,9 +88,9 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> <!--TODO decide gwt packages version number<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${vaadin.gwt.version}"</Export-Package> --> <Import-Package></Import-Package> <!--todo find out what should be in Import-Package --> </instructions> |