Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-10-09 21:53:43 +0000
committerGreg Wilkins2014-10-09 21:53:43 +0000
commit758ce66c8d38f7cda3174b2f169d2bf72da58574 (patch)
treee556dd3ed762136df46a55d02f3af6356bafa2bf /jetty-websocket/pom.xml
parent6ed01709133ab1326479f2f46ce0ecf74905d3d0 (diff)
parent2f696e87bd7e57e7ac6f55b86d40efee8b4614c0 (diff)
downloadorg.eclipse.jetty.project-758ce66c8d38f7cda3174b2f169d2bf72da58574.tar.gz
org.eclipse.jetty.project-758ce66c8d38f7cda3174b2f169d2bf72da58574.tar.xz
org.eclipse.jetty.project-758ce66c8d38f7cda3174b2f169d2bf72da58574.zip
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts: jetty-websocket/pom.xml tests/test-sessions/test-mongodb-sessions/pom.xml
Diffstat (limited to 'jetty-websocket/pom.xml')
-rw-r--r--jetty-websocket/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 6925879e1b..a7e398ab49 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -43,7 +43,7 @@
</goals>
<configuration>
<instructions>
- <Import-Package>javax.servlet.*;version="[3.0,4.0)",org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
+ <Import-Package>javax.servlet.*;version="[3.1,4.0)",org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<_nouses>true</_nouses>
</instructions>
</configuration>

Back to the top