* 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>