commit 394485246a47822253aef3219153dc80ffac9f14
author Elson Yuen <eyuen@ca.ibm.com> Wed Mar 01 15:58:07 2017 -0500
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Wed Mar 01 15:58:07 2017 -0500
tree 79dbc0b6746c00d60692518e6b31ce0d66acae9a
parent 1bef96e3c8ede7c6bc7ed695ceed02b02d89390b
parent b44410cf84cf520ae8aae9d207489f6a90d6c120

Merge "[464221] switch from Bundle-Require to Import-Package for javax.servlet and javax.servlet.http 3.1.0"

plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
index 21d2b15..da92d76 100644
--- a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
@@ -12,9 +12,10 @@
  org.eclipse.jetty.server;bundle-version="[8.0.4,10.0.0)",
  org.eclipse.jetty.util;bundle-version="[8.0.4,10.0.0)",
  org.apache.commons.logging;bundle-version="[1.0.4,2.0.0)",
- javax.servlet;bundle-version="[2.6.0,4.0.0)",
  org.eclipse.jetty.webapp;bundle-version="[8.0.4,10.0.0)",
  org.eclipse.jetty.servlet;bundle-version="[8.0.4,10.0.0)",
  org.eclipse.jetty.xml;bundle-version="[8.0.4,10.0.0)"
+Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
+  javax.servlet.http;version="[3.1.0,4.0.0)
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5