diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/META-INF/MANIFEST.MF
index 9b98d55..4bc4b90 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/META-INF/MANIFEST.MF
@@ -14,9 +14,9 @@
  org.eclipse.jst.j2ee.ejb.annotation.internal.preferences;x-internal:=true,
  org.eclipse.jst.j2ee.ejb.annotation.internal.provider;x-internal:=true,
  org.eclipse.jst.j2ee.ejb.annotation.internal.utility;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)",
- org.eclipse.jdt.core;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.jdt.core;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.core;bundle-version="[1.1.0,1.2.0)",
@@ -25,6 +25,6 @@
  org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
+ org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.2.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF
index e636d99..945e549 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/META-INF/MANIFEST.MF
@@ -9,14 +9,14 @@
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.j2ee.ejb.annotations.internal.classgen;x-internal:=true,
  org.eclipse.jst.j2ee.ejb.annotations.internal.emitter;x-internal:=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.core.resources;bundle-version="[3.2.0,3.3.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.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.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.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.text;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.text;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jst.j2ee.ejb.annotation.model;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.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF
index ebc2925..60fcfcf 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF
@@ -11,12 +11,12 @@
  org.eclipse.jst.j2ee.ejb.annotation.ui.internal.cmp.wizards;x-internal:=true,
  org.eclipse.jst.j2ee.ejb.annotation.ui.internal.preferences;x-internal:=true,
  org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards;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.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.ui;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.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.ui;bundle-version="[1.1.0,1.2.0)",
@@ -27,7 +27,7 @@
  org.eclipse.jst.ejb.ui;bundle-version="[1.1.0,1.2.0)",
  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.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.web.ui;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.rdb.connection.ui;bundle-version="[1.0.101,1.1.0)",
@@ -36,7 +36,7 @@
  org.eclipse.wst.rdb.data.core;bundle-version="[1.0.104,1.1.0)",
  org.eclipse.wst.rdb.data.ui;bundle-version="[1.0.105,1.1.0)",
  org.eclipse.wst.rdb.server.ui;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)"
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
index b65c16a..95f68b8 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
@@ -14,15 +14,15 @@
  org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.ui;x-internal:=true,
  org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.util;x-internal:=true
 Require-Bundle: org.eclipse.jst.j2ee.ejb.annotations.emitter;visibility:=reexport;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.jdt;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.emf.ecore;bundle-version="[2.2.0,2.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)",
  org.eclipse.jst.j2ee.core;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.ui;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.jdt.launching;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.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.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.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
@@ -35,10 +35,10 @@
  org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.ant.core;bundle-version="[3.1.100,3.2.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.ant.ui;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.debug.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ant.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/META-INF/MANIFEST.MF
index a9f4431..8b1486f 100644
--- a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@
 Bundle-Activator: org.eclipse.jst.j2ee.xdoclet.runtime.internal.XDocletRuntimePlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
-Require-Bundle:  org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+Require-Bundle:  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.j2ee.ejb.annotations.xdoclet;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.jst.j2ee.ejb.annotation.model;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.jst.j2ee.xdoclet.runtime.internal;x-internal:=true,