summaryrefslogtreecommitdiffstats
path: root/pom.xml
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 /pom.xml
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 'pom.xml')
-rw-r--r--pom.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index fb8f04dacb..51356c7f7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,11 @@
<javax.servlet.version>3.0.1</javax.servlet.version>
<javax.validation.version>1.0.0.GA</javax.validation.version>
+ <!-- OSGi -->
+ <osgi.javax.servlet.version>3.0.0</osgi.javax.servlet.version>
+ <osgi.execution.environment>JavaSE-1.8</osgi.execution.environment>
+ <osgi.bundle.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</osgi.bundle.version>
+
<!-- Test dependencies -->
<junit.version>4.11</junit.version>