summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorSampsa Sohlman <sampsa@sohlman.com>2016-07-10 20:33:33 +0200
committerSampsa Sohlman <sampsa@sohlman.com>2016-07-14 17:22:42 +0200
commit0a1687783c1b2997ce71597888112e9f0d0b9836 (patch)
tree87b297d1009f40172a388a5e27481d88e6c2142a /server
parent498599fa9b54bc6754287d001e83dcd6a6a26dfd (diff)
downloadvaadin-framework-0a1687783c1b2997ce71597888112e9f0d0b9836.tar.gz
vaadin-framework-0a1687783c1b2997ce71597888112e9f0d0b9836.zip
Fix javax.servlet version
Change-Id: Ie044355ebd9ee165d5f9016666ac46f4df4243d8
Diffstat (limited to 'server')
-rw-r--r--server/pom.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/pom.xml b/server/pom.xml
index 3df2ec1918..f0806dce09 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -223,8 +223,8 @@
<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}"</Export-Package>
- <Import-Package>javax.servlet;version="${javax.servlet.version}",
- javax.servlet.http;version="${javax.servlet.version}",
+ <Import-Package>javax.servlet;version="[2.4,${javax.servlet.version}]",
+ javax.servlet.http;version="[2.4,${javax.servlet.version}]",
javax.validation;version="${javax.validation.version}";resolution:=optional,
org.jsoup;version="${jsoup.version}",
org.jsoup.parser;version="${jsoup.version}",