diff --git a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
index 64f03b6..db17ac0 100644
--- a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.common.internal.annotations.controller;x-internal:=true,
  org.eclipse.jst.common.internal.annotations.registry;x-internal:=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]",
+Require-Bundle:  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
diff --git a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
index ec2b63e..f5e7a2c 100644
--- a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@
 Export-Package: org.eclipse.jst.common.internal.annotations.core;x-internal:=true
 Require-Bundle:  org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]"
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)"
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
index c970ed4..9bc0630 100644
--- a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
@@ -7,18 +7,18 @@
 Bundle-Vendor: %Eclipse_UI_
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.common.internal.annotations.ui;x-internal:=true
-Require-Bundle: org.eclipse.ui.views;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.editors;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.jface.text;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.swt;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+Require-Bundle: org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.swt;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.common.annotations.core;bundle-version="[1.1.0,1.2.0)"
diff --git a/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
index bafd486..e1e3c51 100644
--- a/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
@@ -10,17 +10,17 @@
  org.eclipse.jst.common.jdt.internal.classpath;x-internal:=true,
  org.eclipse.jst.common.jdt.internal.integration;x-internal:=true,
  org.eclipse.jst.common.project.facet
-Require-Bundle: org.eclipse.core.runtime;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]",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.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.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
index 0df1294..ac6a30f 100644
--- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
@@ -72,10 +72,10 @@
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
  com.ibm.icu;bundle-version="[3.4.4,3.5.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
index 4337b4a..da0a4d9 100644
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
@@ -12,17 +12,17 @@
  org.eclipse.jst.j2ee.jca.ui.internal.wizard;x-internal:=true
 Require-Bundle: org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.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.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
index 9ca9b98..040e03d 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
@@ -19,19 +19,19 @@
  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.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.core.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.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)",
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
index 7b2842e..da2b170 100644
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
@@ -9,21 +9,21 @@
 Export-Package: org.eclipse.jst.j2ee.navigator.internal;x-internal:=true,
  org.eclipse.jst.j2ee.navigator.internal.dnd;x-internal:=true,
  org.eclipse.jst.j2ee.navigator.internal.plugin;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.ejb.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.servlet.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.jca.ui;bundle-version="[1.1.0,1.2.0)",
@@ -31,12 +31,12 @@
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.jst.common.frameworks;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.ui.navigator;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.common.project.facet.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.j2ee.jca;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,3.3.0]"
+ org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)"
 Eclipse-LazyStart: true; exceptions="org.eclipse.jst.j2ee.navigator.internal"
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
index 5d5f255..ef46bd1 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
@@ -25,35 +25,35 @@
  org.eclipse.jst.j2ee.internal.wizard;x-internal:=true,
  org.eclipse.jst.j2ee.ui.project.facet,
  org.eclipse.jst.j2ee.ui.project.facet.appclient
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui;bundle-version="[3.2.0,3.3.0]",
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui.workbench;bundle-version="[3.2.1,4.0.0)",
  org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.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.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.jface.text;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.editors;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
@@ -65,8 +65,8 @@
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
  org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
  com.ibm.icu;bundle-version="[3.4.4,3.5.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui.navigator
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
index 16998b0..63058f4 100644
--- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@
  org.eclipse.jst.j2ee.web.datamodel.properties,
  org.eclipse.jst.j2ee.web.project.facet
 Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.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.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
@@ -31,12 +31,12 @@
  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.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]",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.emf.codegen;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
index 68235d5..bd3a7e9 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.j2ee.internal.webservice;x-internal:=true,
  org.eclipse.jst.j2ee.internal.webservice.plugin;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.jface;bundle-version="[3.2.0,3.3.0]",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
@@ -20,16 +20,16 @@
  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.webservice;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.wsdl;bundle-version="[1.0.100,1.1.0)",
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
  org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.j2ee.navigator.ui;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.core.expressions;bundle-version="[3.2.0,3.3.0]"
+ org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
index a049880..682a86b 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
@@ -22,11 +22,11 @@
  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.jface;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
  org.eclipse.wst.wsdl;bundle-version="[1.0.100,1.1.0)",
  org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
index af5af42..112e6b8 100644
--- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -44,7 +44,7 @@
 Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
@@ -55,12 +55,12 @@
  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.common.frameworks;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]",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.emf.codegen;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.modulecore;visibility:=reexport;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
index 2783d62..6283673 100644
--- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
@@ -12,10 +12,10 @@
  org.eclipse.jst.servlet.ui.internal.plugin;x-internal:=true,
  org.eclipse.jst.servlet.ui.internal.wizard;x-internal:=true,
  org.eclipse.jst.servlet.ui.project.facet
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.jface;bundle-version="[3.2.0,3.3.0]",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
@@ -23,21 +23,21 @@
  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.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.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.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.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.ui.ide;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.2.0,2.3.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
index 02cc674..8dc4788 100644
--- a/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.web.ui.internal,
  org.eclipse.wst.web.ui.internal.wizards
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.runtime;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]",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
index 114cead..09b79a8 100644
--- a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
@@ -10,11 +10,11 @@
  org.eclipse.wst.web.internal;x-internal:=true,
  org.eclipse.wst.web.internal.deployables;x-internal:=true,
  org.eclipse.wst.web.internal.operation;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0]",
- org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0]",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",