* bulk update of version to 4.0.0
diff --git a/core/features/org.eclipse.dltk.core-feature/feature.xml b/core/features/org.eclipse.dltk.core-feature/feature.xml
index c1f2ed1..1c7be88 100644
--- a/core/features/org.eclipse.dltk.core-feature/feature.xml
+++ b/core/features/org.eclipse.dltk.core-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.dltk.core"
       label="%featureName"
-      version="3.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.dltk"
       image="eclipse_update_120.jpg">
@@ -24,8 +24,8 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.platform" version="3.4.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.emf.ecore" version="2.4.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.4" match="greaterOrEqual"/>
+      <import feature="org.eclipse.emf.ecore" version="2.4" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/core/features/org.eclipse.dltk.core.index-feature/feature.xml b/core/features/org.eclipse.dltk.core.index-feature/feature.xml
index a6e889b..19ac340 100644
--- a/core/features/org.eclipse.dltk.core.index-feature/feature.xml
+++ b/core/features/org.eclipse.dltk.core.index-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.dltk.core.index"
       label="%featureName"
-      version="3.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.dltk.core.index"
       image="eclipse_update_120.jpg">
@@ -24,11 +24,9 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.dltk.core" version="3.0.0" match="compatible"/>
+      <import feature="org.eclipse.dltk.core" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.dltk.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.dltk.core.index.sql" version="3.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/core/features/org.eclipse.dltk.core.index.sdk/feature.xml b/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
index 8b5b14c..a837a13 100644
--- a/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
+++ b/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.dltk.core.index.sdk"
       label="%featureName"
-      version="3.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -14,12 +14,28 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.dltk.core.index"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.dltk.core.index"/>
+   </requires>
 
-   <includes
+   <plugin
+         id="org.eclipse.dltk.core.index.sql.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.core.index.sql.h2.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.dltk.core.index.source"
+         download-size="0"
+         install-size="0"
          version="0.0.0"/>
 
 </feature>
diff --git a/core/features/org.eclipse.dltk.core.sdk/feature.xml b/core/features/org.eclipse.dltk.core.sdk/feature.xml
index 53a2afd..600221d 100644
--- a/core/features/org.eclipse.dltk.core.sdk/feature.xml
+++ b/core/features/org.eclipse.dltk.core.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.dltk.core.sdk"
       label="%featureName"
-      version="3.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -14,13 +14,121 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.dltk.core"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.dltk.core" version="4.0.0" match="greaterOrEqual"/>
+   </requires>
 
-   <includes
+   <plugin
          id="org.eclipse.dltk.core.source"
-         version="0.0.0"/>
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.debug.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.debug.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.launching.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.console.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.console.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.validators.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.validators.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.testing.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.validators.externalchecker.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.formatter.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.core.manipulation.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.logconsole.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.logconsole.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.dltk.core.doc.isv"
diff --git a/core/features/org.eclipse.dltk.core.tests/feature.xml b/core/features/org.eclipse.dltk.core.tests/feature.xml
index 2ba17a4..f10d6c7 100644
--- a/core/features/org.eclipse.dltk.core.tests/feature.xml
+++ b/core/features/org.eclipse.dltk.core.tests/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.dltk.core.tests"
       label="%featureName"
-      version="3.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%featureProvider">
 
    <description>
diff --git a/core/plugins/org.eclipse.dltk.console.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.console.ui/META-INF/MANIFEST.MF
index 02ae9a1..70fef72 100644
--- a/core/plugins/org.eclipse.dltk.console.ui/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.console.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.console.ui;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.console.ui.ScriptConsoleUIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
@@ -11,12 +11,12 @@
  org.eclipse.ui,
  org.eclipse.ui.console,
  org.eclipse.debug.core,
- org.eclipse.dltk.console;bundle-version="3.0.0",
- org.eclipse.dltk.launching;bundle-version="3.0.0",
+ org.eclipse.dltk.console;bundle-version="4.0.0",
+ org.eclipse.dltk.launching;bundle-version="4.0.0",
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.core.expressions,
  org.eclipse.debug.ui,
- org.eclipse.dltk.core;bundle-version="3.0.0"
+ org.eclipse.dltk.core;bundle-version="4.0.0"
 Export-Package: org.eclipse.dltk.console.ui,
  org.eclipse.dltk.console.ui.internal
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/plugins/org.eclipse.dltk.console/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.console/META-INF/MANIFEST.MF
index c3302d9..5350243 100644
--- a/core/plugins/org.eclipse.dltk.console/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.console/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.console;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.console.ScriptConsolePlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.dltk.core;bundle-version="3.0.0"
+ org.eclipse.dltk.core;bundle-version="4.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.dltk.console
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/plugins/org.eclipse.dltk.core.doc.isv/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.doc.isv/META-INF/MANIFEST.MF
index 84828de..52c11ac 100644
--- a/core/plugins/org.eclipse.dltk.core.doc.isv/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.core.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.core.doc.isv;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
diff --git a/core/plugins/org.eclipse.dltk.core.index.sql.h2/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.index.sql.h2/META-INF/MANIFEST.MF
index 1ecd5f4..ea49bb2 100644
--- a/core/plugins/org.eclipse.dltk.core.index.sql.h2/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.core.index.sql.h2/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DLTK H2-based Indexer
 Bundle-SymbolicName: org.eclipse.dltk.core.index.sql.h2;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.core.index.sql.h2.H2Index
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.h2,
- org.eclipse.dltk.core;bundle-version="3.0.0",
- org.eclipse.dltk.core.index.sql;bundle-version="3.0.0"
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.core.index.sql;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.dltk.core.index.sql.h2,
diff --git a/core/plugins/org.eclipse.dltk.core.index.sql/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.index.sql/META-INF/MANIFEST.MF
index 367f2dc..e3cdc18 100644
--- a/core/plugins/org.eclipse.dltk.core.index.sql/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.core.index.sql/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DLTK Abstract SQL-based Indexer
 Bundle-SymbolicName: org.eclipse.dltk.core.index.sql;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.core.index.sql.SqlIndex
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.dltk.core;bundle-version="3.0.0"
+ org.eclipse.dltk.core;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: 
diff --git a/core/plugins/org.eclipse.dltk.core.index/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.index/META-INF/MANIFEST.MF
index e0f2062..20439bd 100644
--- a/core/plugins/org.eclipse.dltk.core.index/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.core.index/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.core.index
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/core/plugins/org.eclipse.dltk.core.manipulation/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.manipulation/META-INF/MANIFEST.MF
index c5b95b1..7cc2c3f 100644
--- a/core/plugins/org.eclipse.dltk.core.manipulation/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.core.manipulation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.core.manipulation;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.internal.core.manipulation.ScriptManipulationPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/plugins/org.eclipse.dltk.core.tools.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.tools.ui/META-INF/MANIFEST.MF
index 60dd7d5..2f5cbe7 100644
--- a/core/plugins/org.eclipse.dltk.core.tools.ui/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.core.tools.ui/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.core.tools.ui;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.core.tools.ui.DLTKToolsUI
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.dltk.ui
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/core/plugins/org.eclipse.dltk.core/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core/META-INF/MANIFEST.MF
index d477718..0a88666 100644
--- a/core/plugins/org.eclipse.dltk.core/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.core;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.core.DLTKCore
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
diff --git a/core/plugins/org.eclipse.dltk.debug.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.debug.ui/META-INF/MANIFEST.MF
index b90cbea..551a351 100644
--- a/core/plugins/org.eclipse.dltk.debug.ui/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.debug.ui;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.debug.ui.DLTKDebugUIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
@@ -11,16 +11,16 @@
  org.eclipse.debug.ui,
  org.eclipse.ui.ide,
  org.eclipse.core.variables,
- org.eclipse.dltk.core;bundle-version="3.0.0",
- org.eclipse.dltk.ui;bundle-version="3.0.0",
- org.eclipse.dltk.debug;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.ui;bundle-version="4.0.0",
+ org.eclipse.dltk.debug;bundle-version="4.0.0",
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.editors,
  org.eclipse.jface.text,
  org.eclipse.ui.console,
- org.eclipse.dltk.launching;bundle-version="3.0.0",
- org.eclipse.dltk.console;bundle-version="3.0.0",
- org.eclipse.dltk.console.ui;bundle-version="3.0.0",
+ org.eclipse.dltk.launching;bundle-version="4.0.0",
+ org.eclipse.dltk.console;bundle-version="4.0.0",
+ org.eclipse.dltk.console.ui;bundle-version="4.0.0",
  org.eclipse.core.expressions,
  org.eclipse.ui.forms
 Export-Package: org.eclipse.dltk.debug.ui,
diff --git a/core/plugins/org.eclipse.dltk.debug/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.debug/META-INF/MANIFEST.MF
index b4567cd..0fed8b8 100644
--- a/core/plugins/org.eclipse.dltk.debug/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.debug/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.debug; singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.debug.core.DLTKDebugPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
- org.eclipse.dltk.core;bundle-version="3.0.0"
+ org.eclipse.dltk.core;bundle-version="4.0.0"
 Export-Package: org.eclipse.dltk.dbgp,
  org.eclipse.dltk.dbgp.breakpoints,
  org.eclipse.dltk.dbgp.commands,
diff --git a/core/plugins/org.eclipse.dltk.formatter/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.formatter/META-INF/MANIFEST.MF
index 1683bbd..e41a8da 100644
--- a/core/plugins/org.eclipse.dltk.formatter/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.formatter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.formatter;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
@@ -11,7 +11,7 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.text,
  org.eclipse.ui.workbench,
- org.eclipse.dltk.core;bundle-version="3.0.0",
- org.eclipse.dltk.ui;bundle-version="3.0.0"
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.ui;bundle-version="4.0.0"
 Bundle-Activator: org.eclipse.dltk.formatter.DLTKFormatterPlugin
 Bundle-ActivationPolicy: lazy
diff --git a/core/plugins/org.eclipse.dltk.launching/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.launching/META-INF/MANIFEST.MF
index ebcef3b..91eb9b8 100644
--- a/core/plugins/org.eclipse.dltk.launching/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.launching/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.launching;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.internal.launching.DLTKLaunchingPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.core.variables,
  com.ibm.icu,
  org.eclipse.core.expressions,
diff --git a/core/plugins/org.eclipse.dltk.logconsole.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.logconsole.ui/META-INF/MANIFEST.MF
index 91259ff..574bf7e 100644
--- a/core/plugins/org.eclipse.dltk.logconsole.ui/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.logconsole.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.logconsole.ui;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/plugins/org.eclipse.dltk.logconsole/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.logconsole/META-INF/MANIFEST.MF
index 4d70390..192fbfd 100644
--- a/core/plugins/org.eclipse.dltk.logconsole/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.logconsole/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.logconsole;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Activator: org.eclipse.dltk.logconsole.LogConsolePlugin
 Bundle-Vendor: %pluginProvider
diff --git a/core/plugins/org.eclipse.dltk.testing/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.testing/META-INF/MANIFEST.MF
index dd95d2f..9016e99 100755
--- a/core/plugins/org.eclipse.dltk.testing/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.testing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.testing;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.testing.DLTKTestingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -19,11 +19,11 @@
  org.eclipse.ui.ide,
  org.eclipse.ui.console,
  org.eclipse.ui.editors,
- org.eclipse.dltk.core;bundle-version="3.0.0",
-  org.eclipse.dltk.launching;bundle-version="3.0.0",
- org.eclipse.dltk.debug;bundle-version="3.0.0",
- org.eclipse.dltk.debug.ui;bundle-version="3.0.0",
- org.eclipse.dltk.ui;bundle-version="3.0.0"
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+  org.eclipse.dltk.launching;bundle-version="4.0.0",
+ org.eclipse.dltk.debug;bundle-version="4.0.0",
+ org.eclipse.dltk.debug.ui;bundle-version="4.0.0",
+ org.eclipse.dltk.ui;bundle-version="4.0.0"
 Export-Package: org.eclipse.dltk.internal.testing;x-internal:=true,
  org.eclipse.dltk.internal.testing.buildpath;x-internal:=true,
  org.eclipse.dltk.internal.testing.launcher;x-internal:=true,
diff --git a/core/plugins/org.eclipse.dltk.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.ui/META-INF/MANIFEST.MF
index bca0c83..1fce625 100644
--- a/core/plugins/org.eclipse.dltk.ui/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.ui;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.ui.DLTKUIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
@@ -24,9 +24,9 @@
  org.eclipse.search,
  org.eclipse.compare,
  org.eclipse.core.expressions,
- org.eclipse.dltk.launching;bundle-version="3.0.0",
- org.eclipse.dltk.core;bundle-version="3.0.0",
- org.eclipse.dltk.core.manipulation;bundle-version="3.0.0",
+ org.eclipse.dltk.launching;bundle-version="4.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.core.manipulation;bundle-version="4.0.0",
  com.ibm.icu
 Export-Package: org.eclipse.dltk.corext,
  org.eclipse.dltk.corext.documentation,
diff --git a/core/plugins/org.eclipse.dltk.validators.core/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.validators.core/META-INF/MANIFEST.MF
index 66bf901..94ac336 100644
--- a/core/plugins/org.eclipse.dltk.validators.core/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.validators.core/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.validators.core;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.validators.internal.core.ValidatorsCore
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.debug.core,
  org.eclipse.emf.ecore
 Export-Package: org.eclipse.dltk.validators.configs,
diff --git a/core/plugins/org.eclipse.dltk.validators.externalchecker/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.validators.externalchecker/META-INF/MANIFEST.MF
index 8f2bb6a..155717d 100644
--- a/core/plugins/org.eclipse.dltk.validators.externalchecker/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.validators.externalchecker/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.validators.externalchecker;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.validators.internal.externalchecker.core.ExternalCheckerPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -12,8 +12,8 @@
  org.eclipse.ui.console,
  org.eclipse.ui.editors,
  org.eclipse.ui.ide,
- org.eclipse.dltk.core;bundle-version="3.0.0",
- org.eclipse.dltk.launching;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.launching;bundle-version="4.0.0",
  org.eclipse.dltk.ui,
  org.eclipse.dltk.validators.core,
  org.eclipse.dltk.validators.ui
diff --git a/core/plugins/org.eclipse.dltk.validators.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.validators.ui/META-INF/MANIFEST.MF
index 2607bad..b7a7040 100644
--- a/core/plugins/org.eclipse.dltk.validators.ui/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk.validators.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.validators.ui;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.validators.internal.ui.ValidatorsUI
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
@@ -11,8 +11,8 @@
  org.eclipse.ui.console,
  org.eclipse.ui.ide,
  org.eclipse.ui.workbench.texteditor,
- org.eclipse.dltk.core;bundle-version="3.0.0",
- org.eclipse.dltk.ui;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.ui;bundle-version="4.0.0",
  org.eclipse.dltk.validators.core
 Export-Package: org.eclipse.dltk.validators.internal.ui;x-internal:=true,
  org.eclipse.dltk.validators.ui
diff --git a/core/plugins/org.eclipse.dltk/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk/META-INF/MANIFEST.MF
index b658e86..e43ab8d 100644
--- a/core/plugins/org.eclipse.dltk/META-INF/MANIFEST.MF
+++ b/core/plugins/org.eclipse.dltk/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF
index 93215e0..0a433cc 100644
--- a/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.core.tests;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.core.tests.model.ModelTestsPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
-Require-Bundle: org.junit,
+Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.team.core,
- org.eclipse.dltk.launching;bundle-version="3.0.0",
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.launching;bundle-version="4.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.debug.core,
- org.eclipse.dltk.debug;bundle-version="3.0.0"
+ org.eclipse.dltk.debug;bundle-version="4.0.0"
 Export-Package: org.eclipse.dltk.core.tests,
  org.eclipse.dltk.core.tests.buildpath,
  org.eclipse.dltk.core.tests.compiler,
diff --git a/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF
index 21e0b35..7d49365 100644
--- a/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.debug.tests
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.debug.tests.Activator
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.dltk.debug,
- org.eclipse.dltk.launching;bundle-version="3.0.0",
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.launching;bundle-version="4.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  org.junit,
  org.eclipse.debug.core,
  org.eclipse.dltk.core.tests
diff --git a/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF
index 78ec213..eb18f0e 100644
--- a/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.dltk.core.tests,
  org.junit,
  org.eclipse.dltk.debug.ui,
diff --git a/core/tests/org.eclipse.dltk.formatter.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.formatter.tests/META-INF/MANIFEST.MF
index 0f06670..66ffbb0 100644
--- a/core/tests/org.eclipse.dltk.formatter.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.dltk.formatter.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.formatter.tests
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  org.eclipse.text,
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.dltk.ui,
  org.eclipse.dltk.formatter
 Export-Package: org.eclipse.dltk.formatter.tests
diff --git a/core/tests/org.eclipse.dltk.ui.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.ui.tests/META-INF/MANIFEST.MF
index ce6f892..a2831ae 100644
--- a/core/tests/org.eclipse.dltk.ui.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.dltk.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.ui.tests;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.ui.tests.DLTKUITestsPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,7 +11,7 @@
  org.eclipse.ui.navigator,
  org.eclipse.ui.navigator.resources,
  org.eclipse.core.resources,
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.dltk.ui,
  org.junit,
  org.eclipse.ui.ide,
diff --git a/core/tests/org.eclipse.dltk.validators.core.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.validators.core.tests/META-INF/MANIFEST.MF
index 788bf7f..5235444 100644
--- a/core/tests/org.eclipse.dltk.validators.core.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.dltk.validators.core.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.validators.core.tests;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.validators.core.tests.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.dltk.validators.core,
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.core.resources,
  org.junit
 Bundle-ActivationPolicy: lazy
diff --git a/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml b/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml
index d8308ea..c2b4d3e 100644
--- a/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml
+++ b/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.dltk.mylyn"
       label="%featureName"
-      version="3.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -37,9 +37,9 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.dltk.core" version="3.0.0" match="compatible"/>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.mylyn_feature" version="3.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.dltk.core" version="4.0.0" match="compatible"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="4.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.mylyn_feature" version="4.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/mylyn/features/org.eclipse.dltk.mylyn.sdk/feature.xml b/mylyn/features/org.eclipse.dltk.mylyn.sdk/feature.xml
index dc3f90e..87e0bd1 100644
--- a/mylyn/features/org.eclipse.dltk.mylyn.sdk/feature.xml
+++ b/mylyn/features/org.eclipse.dltk.mylyn.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.dltk.mylyn.sdk"
       label="%featureName"
-      version="3.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF b/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF
index 54c7088..826a17a 100644
--- a/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF
+++ b/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.dltk.mylyn;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.internal.mylyn.DLTKUiBridgePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
@@ -15,20 +15,20 @@
  org.eclipse.ui.forms,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench.texteditor,
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.resources.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.ide.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.dltk.core;bundle-version="3.0.0",
- org.eclipse.dltk.ui;bundle-version="3.0.0",
- org.eclipse.dltk.launching;bundle-version="3.0.0",
- org.eclipse.dltk.debug;bundle-version="3.0.0",
- org.eclipse.dltk.debug.ui;bundle-version="3.0.0"
+ org.eclipse.mylyn.context.core;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.mylyn.context.ui;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.mylyn.commons.core;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.mylyn.commons.ui;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.mylyn.monitor.ui;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.mylyn.resources.ui;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.mylyn.monitor.core;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.mylyn.tasks.ui;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.mylyn.ide.ui;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.ui;bundle-version="4.0.0",
+ org.eclipse.dltk.launching;bundle-version="4.0.0",
+ org.eclipse.dltk.debug;bundle-version="4.0.0",
+ org.eclipse.dltk.debug.ui;bundle-version="4.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.dltk.internal.mylyn,
diff --git a/rse/features/org.eclipse.dltk.rse-feature/feature.xml b/rse/features/org.eclipse.dltk.rse-feature/feature.xml
index 11c0c2d..b5028bf 100644
--- a/rse/features/org.eclipse.dltk.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.dltk.rse-feature/feature.xml
@@ -37,8 +37,8 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.dltk.core" version="3.0.0" match="compatible"/>
-      <import feature="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
+      <import feature="org.eclipse.dltk.core" version="4.0.0" match="compatible"/>
+      <import feature="org.eclipse.rse.core" version="4.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
index 4a74e46..7037aad 100644
--- a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
@@ -10,16 +10,16 @@
  org.eclipse.core.filesystem,
  org.eclipse.core.resources,
  com.jcraft.jsch,
- org.eclipse.dltk.core;bundle-version="3.0.0",
- org.eclipse.dltk.launching;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.launching;bundle-version="4.0.0",
  org.eclipse.dltk.ssh.core;bundle-version="1.0.0",
- org.eclipse.rse.core;bundle-version="3.0.0",
- org.eclipse.rse.subsystems.files.core;bundle-version="3.0.0",
- org.eclipse.rse.subsystems.shells.core;bundle-version="3.0.0",
+ org.eclipse.rse.core;bundle-version="4.0.0",
+ org.eclipse.rse.subsystems.files.core;bundle-version="4.0.0",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="4.0.0",
  org.eclipse.rse.efs,
- org.eclipse.rse.services;bundle-version="3.0.0",
+ org.eclipse.rse.services;bundle-version="4.0.0",
  org.eclipse.rse.connectorservice.ssh;resolution:=optional,
- org.eclipse.rse.services.ssh;bundle-version="3.0.0";resolution:=optional
+ org.eclipse.rse.services.ssh;bundle-version="4.0.0";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.dltk.core.internal.rse;x-friends:=org.eclipse.dltk.rse.ui,
  org.eclipse.dltk.core.internal.rse.perfomance;x-internal:=true
diff --git a/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF
index 0be69e5..d6107bd 100644
--- a/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.dltk.rse.core;bundle-version="2.0.0",
- org.eclipse.dltk.core;bundle-version="3.0.0",
- org.eclipse.dltk.ui;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.ui;bundle-version="4.0.0",
  org.eclipse.rse.ui,
  org.eclipse.rse.core,
  org.eclipse.rse.services,
diff --git a/rse/plugins/org.eclipse.dltk.rse/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse/META-INF/MANIFEST.MF
index 21b979f..80558f8 100644
--- a/rse/plugins/org.eclipse.dltk.rse/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dltk.rse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.rse
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF
index 276e785..be82993 100644
--- a/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Activator: org.eclipse.dltk.ssh.internal.core.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.dltk.core;bundle-version="3.0.0",
+ org.eclipse.dltk.core;bundle-version="4.0.0",
  com.jcraft.jsch,
  org.eclipse.jsch.core
 Bundle-RequiredExecutionEnvironment: J2SE-1.5