diff --git a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
index 945aeac..21ed804 100644
--- a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
@@ -9,13 +9,13 @@
 Export-Package: org.eclipse.jst.server.core,
  org.eclipse.jst.server.core.internal;x-friends:="org.eclipse.jst.server.ui",
  org.eclipse.jst.server.core.internal.cactus;x-friends:="org.eclipse.jst.server.ui"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.expressions,
- org.eclipse.debug.core,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.common.project.facet.core
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.expressions;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
index 36d0161..72f84ef 100644
--- a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
@@ -14,18 +14,18 @@
  org.eclipse.jst.server.generic.internal.servertype.definition.util;x-internal:=true,
  org.eclipse.jst.server.generic.internal.xml;x-internal:=true,
  org.eclipse.jst.server.generic.servertype.definition
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching;visibility:=reexport,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core,
- org.eclipse.ant.ui;resolution:=optional,
- org.eclipse.emf.common;visibility:=reexport,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.ui.externaltools;resolution:=optional,
- org.apache.ant,
- org.eclipse.debug.ui;resolution:=optional
-Eclipse-AutoStart: true
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.launching;visibility:="reexport";bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.ant.ui;resolution:="optional";bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.emf.common;visibility:="reexport";bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.ui.externaltools;resolution:="optional";bundle-version="[3.1.100,3.2.0)",
+ org.apache.ant;bundle-version="[1.6.5,1.7.0)",
+ org.eclipse.debug.ui;resolution:="optional";bundle-version="[3.2.0,3.3.0)"
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
index cd57fda..1609c33 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@
 Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.server.core,
- org.eclipse.jst.server.generic.core,
- org.eclipse.jst.server.generic.ui,
- org.eclipse.jst.server.ui,
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui
+Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.generic.core;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
 Bundle-ClassPath: genericjboss.jar
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
index 23b61c6..6458bf8 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@
 Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.server.core,
- org.eclipse.jst.server.generic.core,
- org.eclipse.jst.server.generic.ui,
- org.eclipse.jst.server.ui,
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui
+Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.generic.core;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
 Bundle-ClassPath: genericjonas.jar
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
index e58c1c7..56a49f2 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@
 Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.server.generic.core,
- org.eclipse.jst.server.generic.ui,
- org.eclipse.jst.server.core,
- org.eclipse.jst.server.ui,
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui
+Require-Bundle: org.eclipse.jst.server.generic.core;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
 Bundle-ClassPath: genericoc4j.jar
diff --git a/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
index 07ff222..c147b7e 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.server.generic.ui.internal;x-internal:=true
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.server.ui,
- org.eclipse.debug.ui,
- org.eclipse.jdt.debug.ui,
- org.eclipse.jst.server.core,
- org.eclipse.jst.server.generic.core,
- org.eclipse.wst.server.core
-Eclipse-AutoStart: true
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.wst.server.ui;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.generic.core;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)"
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF
index 458bacd..ab01e2d 100644
--- a/plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF
@@ -5,5 +5,5 @@
 Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.server.core
+Require-Bundle:  org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)"
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
index 0ffd0ae..2f6bc55 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
@@ -11,12 +11,12 @@
  org.eclipse.jst.server.tomcat.core.internal.xml;x-friends:="org.eclipse.jst.server.tomcat.ui",
  org.eclipse.jst.server.tomcat.core.internal.xml.server32;x-friends:="org.eclipse.jst.server.tomcat.ui",
  org.eclipse.jst.server.tomcat.core.internal.xml.server40;x-friends:="org.eclipse.jst.server.tomcat.ui"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.commands,
- org.eclipse.debug.core,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
index 871ff8b..f2d0bf8 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
@@ -8,18 +8,18 @@
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.server.tomcat.ui.internal;x-internal:=true,
  org.eclipse.jst.server.tomcat.ui.internal.editor;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.expressions,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.forms,
- org.eclipse.debug.ui,
- org.eclipse.jdt.debug.ui,
- org.eclipse.jdt.launching,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.jst.server.core,
- org.eclipse.jst.server.ui,
- org.eclipse.jst.server.tomcat.core
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.expressions;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.ui.forms;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.wst.server.ui;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.tomcat.core;bundle-version="[1.0.102,1.1.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
index c48b55b..cea379c 100644
--- a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
@@ -8,21 +8,21 @@
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.server.ui.internal;x-internal:=true,
  org.eclipse.jst.server.ui.internal.cactus;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.ui,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.junit,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.jst.server.core,
- org.eclipse.ui.ide,
- org.eclipse.jdt.ui,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jface.text
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.junit;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.wst.server.ui;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,3.3.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
index 3d05ce8..77d9207 100644
--- a/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
@@ -7,22 +7,22 @@
 Bundle-Activator: org.eclipse.jst.server.websphere.core.CorePlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core,
- org.eclipse.jst.server.ui,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.server.generic.core,
- org.eclipse.jst.server.generic.ui,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.common.modulecore,
- org.eclipse.core.runtime,
- org.eclipse.core.resources
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.server.generic.core;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)"
 Eclipse-AutoStart: true
 Export-Package: org.eclipse.jst.server.websphere.core