Upversioned the plugins, etc to 2.0.0.

Made sure the jar files got included in the zips.

40 files changed, 165 insertions, 181 deletions

diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml
index 77f57f4f6f8..f0d5138179c 100644
--- a/build/org.eclipse.cdt.make.core/plugin.xml
+++ b/build/org.eclipse.cdt.make.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.make.core"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.make.core.MakeCorePlugin">
 
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index ee5c4156e81..761e8aa0fa4 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.make.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.make.internal.ui.MakeUIPlugin">
 
@@ -33,8 +33,8 @@
             icon="icons/ctool16/newc_app.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCProjectWizard"
-            project="true"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            project="true"
             id="org.eclipse.cdt.ui.wizards.NewMakeCProjectWizard">
          <description>
             %WizardNewCMakeProject.description
@@ -60,8 +60,8 @@
             icon="icons/ctool16/newcc_app.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCCProjectWizard"
-            project="true"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            project="true"
             id="org.eclipse.cdt.make.ui.wizards.NewMakeCCProjectWizard">
          <description>
             %WizardNewCCMakeProject.description
@@ -85,8 +85,8 @@
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
-            objectClass="org.eclipse.cdt.core.model.ICContainer"
             adaptable="false"
+            objectClass="org.eclipse.cdt.core.model.ICContainer"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -108,8 +108,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            objectClass="org.eclipse.cdt.core.model.ITranslationUnit"
             adaptable="false"
+            objectClass="org.eclipse.cdt.core.model.ITranslationUnit"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -131,8 +131,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            objectClass="org.eclipse.cdt.core.model.IBinary"
             adaptable="false"
+            objectClass="org.eclipse.cdt.core.model.IBinary"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -154,8 +154,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            objectClass="org.eclipse.cdt.core.model.IArchive"
             adaptable="false"
+            objectClass="org.eclipse.cdt.core.model.IArchive"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -177,8 +177,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            objectClass="org.eclipse.core.resources.IResource"
             adaptable="false"
+            objectClass="org.eclipse.core.resources.IResource"
             id="org.eclipse.cdt.make.ui.popupMenu.NavigatorContribution">
          <action
                label="%ActionMakeBuildTarget.label"
@@ -204,18 +204,17 @@
          point="org.eclipse.ui.commands">
       <command
             name="%CommandTargetBuild.name"
-            description="%CommandTargetBuild.description"
             category="org.eclipse.ui.category.project"
+            description="%CommandTargetBuild.description"
             id="org.eclipse.cdt.make.ui.targetBuildCommand">
       </command>
       <command
             name="%CommandTargetCreate.name"
-            description="%CommandTargetCreate.description"
             category="org.eclipse.ui.category.project"
+            description="%CommandTargetCreate.description"
             id="org.eclipse.cdt.make.ui.targetCreateCommand">
       </command>
    </extension>
-
 <!-- Makefile Editor keybindings  -->
    <extension
          point="org.eclipse.ui.commands">
@@ -232,8 +231,8 @@
       </scope>
       <command
             name="%ActionDefinition.comment.name"
-            description="%ActionDefinition.comment.description"
             category="org.eclipse.cdt.make.ui.category.source"
+            description="%ActionDefinition.comment.description"
             id="org.eclipse.cdt.make.ui.edit.text.makefile.comment">
       </command>
       <keyBinding
@@ -244,8 +243,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.uncomment.name"
-            description="%ActionDefinition.uncomment.description"
             category="org.eclipse.cdt.make.ui.category.source"
+            description="%ActionDefinition.uncomment.description"
             id="org.eclipse.cdt.make.ui.edit.text.makefile.uncomment">
       </command>
       <keyBinding
@@ -255,7 +254,6 @@
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
    </extension>
-
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
@@ -268,8 +266,8 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            objectClass="org.eclipse.core.resources.IProject"
             adaptable="true"
+            objectClass="org.eclipse.core.resources.IProject"
             name="%PropertyMakeProject.name"
             class="org.eclipse.cdt.make.internal.ui.properties.MakePropertyPage"
             id="org.eclipse.cdt.make.ui.properties.MakePropertyPage">
@@ -301,8 +299,8 @@
          <action
                label="%ActionMakeUpdate.label"
                icon="icons/ctool16/update_old.gif"
-               tooltip="%ActionMakeUpdate.tooltip"
                class="org.eclipse.cdt.make.ui.actions.UpdateMakeProjectAction"
+               tooltip="%ActionMakeUpdate.tooltip"
                toolbarPath="Normal"
                id="org.eclipse.cdt.make.ui.UpdateMakeAction">
             <enablement>
@@ -362,9 +360,8 @@
          </action>
       </actionSet>
    </extension>
-
 <!-- Makefile Editor comment out for CDT 1.2 -->
-   <!--extension
+<!--extension
          id="org.eclipse.cdt.make.editor"
          name="MakefileEditor"
          point="org.eclipse.ui.editors">
@@ -389,8 +386,8 @@
          <view
                relative="org.eclipse.ui.views.ContentOutline"
                visible="true"
-               relationship="stack"
-               id="org.eclipse.cdt.make.ui.views.MakeView">
+               id="org.eclipse.cdt.make.ui.views.MakeView"
+               relationship="stack">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.make.ui.views.MakeView">
diff --git a/build/org.eclipse.cdt.managedbuilder.core/build.properties b/build/org.eclipse.cdt.managedbuilder.core/build.properties
index 57d16989153..9f95adad610 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/build.properties
@@ -1,5 +1,6 @@
-source.mngbuildcore.jar = src/
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               schema/
+               schema/,\
+               mngbuildcore.jar
+source.mngbuildcore.jar = src/
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index e7ad4a393c1..bd23ba81117 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.managedbuilder.core"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin">
 
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/build.properties b/build/org.eclipse.cdt.managedbuilder.ui/build.properties
index 9dddb86fa30..7258fc9dfd4 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/build.properties
@@ -1,5 +1,6 @@
-source.mgdbuildui.jar = src/
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               icons/
+               icons/,\
+               mgdbuildui.jar
+source.mgdbuildui.jar = src/
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index e9041e41a2f..6be5572eaa4 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.managedbuilder.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin">
 
@@ -14,10 +14,6 @@
    </runtime>
    <requires>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.cdt.core"/>
diff --git a/core/org.eclipse.cdt.core.aix/fragment.xml b/core/org.eclipse.cdt.core.aix/fragment.xml
index 9824916abbf..0fb9263b4fc 100644
--- a/core/org.eclipse.cdt.core.aix/fragment.xml
+++ b/core/org.eclipse.cdt.core.aix/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.aix"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
@@ -12,11 +12,11 @@
       <library name="cdtaix.jar"/>
    </runtime>
 
+
    <extension
          point="org.eclipse.cdt.core.ProcessList">
       <processList
             class="org.eclipse.cdt.internal.core.linux.ProcessList">
       </processList>
    </extension>
-
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux/build.properties b/core/org.eclipse.cdt.core.linux/build.properties
index 5676697c351..6e10a326c55 100644
--- a/core/org.eclipse.cdt.core.linux/build.properties
+++ b/core/org.eclipse.cdt.core.linux/build.properties
@@ -1,9 +1,10 @@
 bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
+               os/,\
+               cdt_linux.jar
 src.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 			   
+               os/
 source.cdt_linux.jar = src/
diff --git a/core/org.eclipse.cdt.core.linux/fragment.xml b/core/org.eclipse.cdt.core.linux/fragment.xml
index 989c14ab6e7..84e7988771e 100644
--- a/core/org.eclipse.cdt.core.linux/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.linux"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
diff --git a/core/org.eclipse.cdt.core.qnx/build.properties b/core/org.eclipse.cdt.core.qnx/build.properties
index ec4ae70ed60..ef4622fb432 100644
--- a/core/org.eclipse.cdt.core.qnx/build.properties
+++ b/core/org.eclipse.cdt.core.qnx/build.properties
@@ -1,9 +1,10 @@
 bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
+               os/,\
+               cdt_qnx.jar
+source.cdt_qnx.jar = src/
 src.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
-source.cdt_qnx.jar = src/
+               os/
diff --git a/core/org.eclipse.cdt.core.qnx/fragment.xml b/core/org.eclipse.cdt.core.qnx/fragment.xml
index 11745e6d5dd..3026a159cc6 100644
--- a/core/org.eclipse.cdt.core.qnx/fragment.xml
+++ b/core/org.eclipse.cdt.core.qnx/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.qnx"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
diff --git a/core/org.eclipse.cdt.core.solaris/build.properties b/core/org.eclipse.cdt.core.solaris/build.properties
index bcd4a1a0251..3c308d2f2d2 100644
--- a/core/org.eclipse.cdt.core.solaris/build.properties
+++ b/core/org.eclipse.cdt.core.solaris/build.properties
@@ -1,9 +1,10 @@
 bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
+               os/,\
+               cdt_solaris.jar
 src.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/                
+               os/
 source.cdt_solaris.jar = src/
diff --git a/core/org.eclipse.cdt.core.solaris/fragment.xml b/core/org.eclipse.cdt.core.solaris/fragment.xml
index 495da0f7b5e..ecef10d34cc 100644
--- a/core/org.eclipse.cdt.core.solaris/fragment.xml
+++ b/core/org.eclipse.cdt.core.solaris/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.solaris"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index fe0fd3442e1..7114e7571e4 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.core.tests"
    name="org.eclipse.cdt.core.tests"
-   version="1.2.0"
+   version="2.0.0"
    class="org.eclipse.cdt.testplugin.CTestPlugin">
 
    <runtime>
@@ -13,10 +13,7 @@
    </runtime>
    <requires>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
@@ -209,7 +206,7 @@
                      builtIn="false">
                </listOptionValue>
                <listOptionValue
-		             value="&quot;../includes&quot;"
+                     value="&quot;../includes&quot;"
                      builtIn="false">
                </listOptionValue>
             </option>
diff --git a/core/org.eclipse.cdt.core.win32/build.properties b/core/org.eclipse.cdt.core.win32/build.properties
index ca4d06b082b..776fc95bb2e 100644
--- a/core/org.eclipse.cdt.core.win32/build.properties
+++ b/core/org.eclipse.cdt.core.win32/build.properties
@@ -1,9 +1,10 @@
 bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
+               os/,\
+               cdt_win32.jar
 src.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/               
+               os/
 source.cdt_win32.jar = src/
diff --git a/core/org.eclipse.cdt.core.win32/fragment.xml b/core/org.eclipse.cdt.core.win32/fragment.xml
index d56f46969d6..d543dc3661e 100644
--- a/core/org.eclipse.cdt.core.win32/fragment.xml
+++ b/core/org.eclipse.cdt.core.win32/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.win32"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
diff --git a/core/org.eclipse.cdt.core/build.properties b/core/org.eclipse.cdt.core/build.properties
index 9b6e7bcb3af..cdada4ac275 100644
--- a/core/org.eclipse.cdt.core/build.properties
+++ b/core/org.eclipse.cdt.core/build.properties
@@ -1,6 +1,10 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               cdtparser.jar,\
+               cdtcore.jar
+jars.compile.order = cdtparser.jar,\
+                     cdtcore.jar
 src.includes = about.html,\
                schema/
 javadoc.packages = org.eclipse.cdt.core.*,\
@@ -18,5 +22,3 @@ source.cdtcore.jar = build/,\
                      search/,\
                      dependency/
 source.cdtparser.jar = parser/
-jars.compile.order = cdtparser.jar,\
-                     cdtcore.jar
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index f31224caffb..31688d78655 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.core"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.core.CCorePlugin">
 
@@ -19,9 +19,6 @@
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.apache.xerces"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.team.core"/>
    </requires>
 
diff --git a/core/org.eclipse.cdt.ui.tests/build.properties b/core/org.eclipse.cdt.ui.tests/build.properties
index 566fba87bee..66865c3199e 100644
--- a/core/org.eclipse.cdt.ui.tests/build.properties
+++ b/core/org.eclipse.cdt.ui.tests/build.properties
@@ -4,7 +4,8 @@ source.cdtuitests.jar = src/,\
 bin.includes = plugin.xml,\
                about.html,\
                plugin.properties,\
-               test.xml
+               test.xml,\
+               cdtuitests.jar
 src.includes = plugin.xml,\
                about.html,\
                plugin.properties,\
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index 054005b77fa..f858df8da55 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.ui.tests"
    name="org.eclipse.cdt.ui.tests"
-   version="1.2.0"
+   version="2.0.0"
    class="org.eclipse.cdt.testplugin.CTestPlugin">
 
    <runtime>
@@ -12,15 +12,9 @@
       </library>
    </runtime>
    <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.ui"/>
diff --git a/core/org.eclipse.cdt.ui/build.properties b/core/org.eclipse.cdt.ui/build.properties
index 223fb70851e..6b55904498a 100644
--- a/core/org.eclipse.cdt.ui/build.properties
+++ b/core/org.eclipse.cdt.ui/build.properties
@@ -2,7 +2,8 @@ bin.includes = about.html,\
                plugin.xml,\
                about.html,\
                icons/,\
-               plugin.properties
+               plugin.properties,\
+               cdtui.jar
 source.cdtui.jar = src/,\
                    utils.ui/
 src.includes = about.html,\
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index a17ff02d33d..43632749ca7 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.ui.CUIPlugin">
 
@@ -165,26 +165,26 @@
          id="org.eclipse.cdt.ui.ceditor"
          point="org.eclipse.ui.editors">
       <editor
-            name="%CEditor.name"
             default="true"
-            icon="icons/full/obj16/c_file_obj.gif"
+            name="%CEditor.name"
             extensions="c, h, cc, hh, cpp, cxx, hpp"
-            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+            icon="icons/full/obj16/c_file_obj.gif"
             class="org.eclipse.cdt.internal.ui.editor.CEditor"
+            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             id="org.eclipse.cdt.ui.editor.CEditor">
       </editor>
       <editor
             name="%Editors.DefaultTextEditor"
-            icon="icons/full/obj16/file_obj.gif"
             extensions="mk"
-            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+            icon="icons/full/obj16/file_obj.gif"
             class="org.eclipse.ui.editors.text.TextEditor"
+            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
             id="org.eclipse.ui.DefaultTextEditor">
       </editor>
       <editor
             name="%AsmEditor.name"
-            icon="icons/full/obj16/c_file_obj.gif"
             extensions="s"
+            icon="icons/full/obj16/c_file_obj.gif"
             class="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"
             id="org.eclipse.cdt.ui.editor.asm.AsmEditor">
       </editor>
@@ -253,16 +253,16 @@
          <action
                label="%AddTask.label"
                helpContextId="org.eclipse.ui.AddTask_action_context"
-               tooltip="%AddTask.tooltip"
                class="org.eclipse.ui.texteditor.TaskRulerAction"
+               tooltip="%AddTask.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.TaskRulerAction">
          </action>
          <action
                label="%AddBookmark.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
-               tooltip="%AddBookmark.tooltip"
                class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               tooltip="%AddBookmark.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
@@ -273,16 +273,16 @@
          <action
                label="%AddTask.label"
                helpContextId="org.eclipse.ui.AddTask_action_context"
-               tooltip="%AddTask.tooltip"
                class="org.eclipse.ui.texteditor.TaskRulerAction"
+               tooltip="%AddTask.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.TaskRulerAction">
          </action>
          <action
                label="%AddBookmark.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
-               tooltip="%AddBookmark.tooltip"
                class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               tooltip="%AddBookmark.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
@@ -312,24 +312,24 @@
          <action
                label="%OpenNewFileWizardAction.label"
                icon="icons/full/ctool16/newfile_wiz.gif"
-               tooltip="%OpenNewFileWizardAction.tooltip"
                class="org.eclipse.cdt.internal.ui.wizards.OpenNewFileWizardAction"
+               tooltip="%OpenNewFileWizardAction.tooltip"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenNewFileWizardAction">
          </action>
          <action
                label="%OpenNewFolderWizardAction.label"
                icon="icons/full/ctool16/newfolder_wiz.gif"
-               tooltip="%OpenNewFolderWizardAction.tooltip"
                class="org.eclipse.cdt.internal.ui.wizards.OpenNewFolderWizardAction"
+               tooltip="%OpenNewFolderWizardAction.tooltip"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenNewFolderWizardAction">
          </action>
          <action
                label="%OpenClassWizardAction.label"
                icon="icons/full/ctool16/newclass_wiz.gif"
-               tooltip="%OpenClassWizardAction.tooltip"
                class="org.eclipse.cdt.ui.actions.OpenClassWizardAction"
+               tooltip="%OpenClassWizardAction.tooltip"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenClassWizardAction">
             <enablement>
@@ -370,8 +370,8 @@
       </category>
       <command
             name="%ActionDefinition.comment.name"
-            description="%ActionDefinition.comment.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.comment.description"
             id="org.eclipse.cdt.ui.edit.text.c.comment">
       </command>
       <keyBinding
@@ -382,8 +382,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.uncomment.name"
-            description="%ActionDefinition.uncomment.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.uncomment.description"
             id="org.eclipse.cdt.ui.edit.text.c.uncomment">
       </command>
       <keyBinding
@@ -394,8 +394,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.opendecl.name"
-            description="%ActionDefinition.opendecl.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.opendecl.description"
             id="org.eclipse.cdt.ui.edit.opendecl">
       </command>
       <keyBinding
@@ -412,8 +412,8 @@
       <page
             showScopeSection="true"
             label="%CSearchPage.label"
-            icon="icons/full/obj16/csearch_obj.gif"
             extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
+            icon="icons/full/obj16/csearch_obj.gif"
             class="org.eclipse.cdt.internal.ui.search.CSearchPage"
             sizeHint="460, 160"
             id="org.eclipse.cdt.ui.CSearchPage">
@@ -425,24 +425,24 @@
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ElementNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            tooltip="%ElementNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
+            tooltip="%ElementNameSorter.tooltip"
             id="org.eclipse.search.internal.ui.ElementNameSorter">
       </sorter>
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ParentNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            tooltip="%ParentNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.ParentNameSorter"
+            tooltip="%ParentNameSorter.tooltip"
             id="org.eclipse.search.internal.ui.ParentNameSorter">
       </sorter>
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%PathNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            tooltip="%PathNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
+            tooltip="%PathNameSorter.tooltip"
             id="org.eclipse.search.internal.ui.PathNameSorter">
       </sorter>
    </extension>
@@ -484,16 +484,16 @@
    <extension
          point="org.eclipse.cdt.ui.BinaryParserPage">
       <parserPage
-            parserID="org.eclipse.cdt.core.GNU_ELF"
             class="org.eclipse.cdt.ui.dialogs.GNUElfBinaryParserPage"
+            parserID="org.eclipse.cdt.core.GNU_ELF"
             id="ElfBinaryParserPage">
       </parserPage>
    </extension>
    <extension
          point="org.eclipse.cdt.ui.BinaryParserPage">
       <parserPage
-            parserID="org.eclipse.cdt.core.Cygwin_PE"
             class="org.eclipse.cdt.ui.dialogs.CygwinPEBinaryParserPage"
+            parserID="org.eclipse.cdt.core.Cygwin_PE"
             id="PEBinaryParserPage">
       </parserPage>
    </extension>
diff --git a/debug/org.eclipse.cdt.debug.core/build.properties b/debug/org.eclipse.cdt.debug.core/build.properties
index fd42cdb9524..68056ad95d9 100644
--- a/debug/org.eclipse.cdt.debug.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.core/build.properties
@@ -1,6 +1,7 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               cdtdebugcore.jar
 src.includes = plugin.xml,\
                plugin.properties,\
                about.html
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml
index 786994fe9c3..2eb7e3d3768 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.core"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.core.CDebugCorePlugin">
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/build.properties b/debug/org.eclipse.cdt.debug.mi.core/build.properties
index 2484ad9c887..1c84c5c4628 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.core/build.properties
@@ -1,6 +1,7 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               cdtmicore.jar
 src.includes = plugin.xml,\
                plugin.properties,\
                about.html
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index b33467db189..f2cf60dba6d 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.mi.core"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.mi.core.MIPlugin">
 
@@ -25,25 +25,25 @@
       <debugger
             platform="native"
             name="%GDBDebugger.name"
-            modes="run,core,attach"
-            cpu="native"
             class="org.eclipse.cdt.debug.mi.core.GDBDebugger"
+            cpu="native"
+            modes="run,core,attach"
             id="org.eclipse.cdt.debug.mi.core.CDebugger">
       </debugger>
       <debugger
             platform="win32"
             name="%CygwinGDBDebugger.name"
-            modes="run,core,attach"
-            cpu="native"
             class="org.eclipse.cdt.debug.mi.core.CygwinGDBDebugger"
+            cpu="native"
+            modes="run,core,attach"
             id="org.eclipse.cdt.debug.mi.core.CygwinCDebugger">
       </debugger>
       <debugger
             platform="native"
             name="%GDBServer.name"
-            modes="run"
-            cpu="native"
             class="org.eclipse.cdt.debug.mi.core.GDBServerDebugger"
+            cpu="native"
+            modes="run"
             id="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger">
       </debugger>
    </extension>
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/build.properties b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
index 3f8bc18ddb9..86e748287d4 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
@@ -1,7 +1,8 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               icons/
+               icons/,\
+               cdtmiui.jar
 src.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
index 48d01ffcda7..fae2bdebb94 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.mi.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin">
 
@@ -13,17 +13,11 @@
       </library>
    </runtime>
    <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.cdt.debug.mi.core"/>
       <import plugin="org.eclipse.cdt.debug.ui"/>
       <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.cdt.launch"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
index 525a8a55b67..9c553226936 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.ui.tests"
    name="org.eclipse.cdt.debug.ui.tests"
-   version="1.2.0"
+   version="2.0.0"
    class="org.eclipse.cdt.debug.testplugin.CTestPlugin">
 
    <runtime>
@@ -13,21 +13,13 @@
    </runtime>
    <requires>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.apache.xerces"/>
-      <import plugin="org.eclipse.core.boot"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.swt"/>
       <import plugin="org.junit"/>
       <import plugin="org.eclipse.cdt.debug.core"/>
       <import plugin="org.eclipse.cdt.debug.mi.core"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.update.core"/>
    </requires>
 
 
diff --git a/debug/org.eclipse.cdt.debug.ui/build.properties b/debug/org.eclipse.cdt.debug.ui/build.properties
index be3d607c076..566017b98c1 100644
--- a/debug/org.eclipse.cdt.debug.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.ui/build.properties
@@ -1,11 +1,12 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               icons/
+               icons/,\
+               cdtdebugui.jar
 src.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
                icons/
-source.cdtdebugui.jar = src/
 javadoc.packages = org.eclipse.cdt.debug.ui.*,\
                    org.eclipse.cdt.debug.ui.sourcelookup.*
+source.cdtdebugui.jar = src/
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index d4a02b348b9..dc45ed0d521 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.ui.CDebugUIPlugin">
 
@@ -14,7 +14,6 @@
    </runtime>
    <requires>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
       <import plugin="org.eclipse.ui.editors"/>
@@ -941,8 +940,8 @@
             targetID="org.eclipse.debug.ui.DebugView"
             id="org.eclipse.cdt.debug.ui.debugview.toolbar">
          <action
-               toolbarPath="threadGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.RestartActionDelegate"
+               toolbarPath="threadGroup"
                hoverIcon="icons/full/clcl16/restart.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.RestartActionDelegate"
                disabledIcon="icons/full/dlcl16/restart.gif"
@@ -960,8 +959,8 @@
          </action>
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/show_paths.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
@@ -978,8 +977,8 @@
          </action>
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.SwitchToDisassemblyActionDelegate"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/disassembly.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.SwitchToDisassemblyActionDelegate"
                disabledIcon="icons/full/dlcl16/disassembly.gif"
@@ -997,8 +996,8 @@
          </action>
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.DebuggerConsoleActionDelegate"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/debugger_console.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.DebuggerConsoleActionDelegate"
                disabledIcon="icons/full/dlcl16/debugger_console.gif"
@@ -1020,8 +1019,8 @@
             id="org.eclipse.cdt.debug.ui.breakpointview.toolbar">
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/show_paths.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
@@ -1041,8 +1040,8 @@
             targetID="org.eclipse.debug.ui.ExpressionView"
             id="org.eclipse.debug.ui.expressionsView.toolbar">
          <action
-               toolbarPath="expressionGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.AddGlobalsActionDelegate"
+               toolbarPath="expressionGroup"
                hoverIcon="icons/full/clcl16/watch_globals.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.AddGlobalsActionDelegate"
                disabledIcon="icons/full/dlcl16/watch_globals.gif"
@@ -1064,8 +1063,8 @@
             id="org.eclipse.debug.ui.sharedLibrariesView.toolbar">
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/show_paths.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
@@ -1258,8 +1257,8 @@
             id="org.eclipse.cdt.debug.ui.DefaultSourceLocator">
       </sourceLocator>
       <sourceLocator
-            class="org.eclipse.cdt.debug.ui.sourcelookup.DefaultSourceLocator"
             name="%OldDefaultSourceLocator.name"
+            class="org.eclipse.cdt.debug.ui.sourcelookup.DefaultSourceLocator"
             id="org.eclipse.cdt.launch.DefaultSourceLocator">
       </sourceLocator>
    </extension>
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index 2c44b5689af..5bb34f72fc6 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.doc.user"
    name="C/C++ Development User Guide"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="eclipse.org">
 
    <runtime>
diff --git a/launch/org.eclipse.cdt.launch/build.properties b/launch/org.eclipse.cdt.launch/build.properties
index 90177f3f0f0..39635cca9f4 100644
--- a/launch/org.eclipse.cdt.launch/build.properties
+++ b/launch/org.eclipse.cdt.launch/build.properties
@@ -1,13 +1,13 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
-               about.html
+               about.html,\
+               cdtlaunch.jar
 src.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
                about.html
-source.cdtlaunch.jar = src/
 javadoc.packages = org.eclipse.cdt.launch.ui.*,\
                    org.eclipse.cdt.launch.sourcelookup*,\
                    org.eclipse.cdt.launch.*
-
+source.cdtlaunch.jar = src/
diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 5cb787fc227..f9221e7ec79 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.launch"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin">
 
@@ -14,10 +14,6 @@
    </runtime>
    <requires>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index dcfb07356a7..c2268506632 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt"
       label="%featureName"
-      version="1.2.0"
+      version="2.0.0"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -19,61 +19,74 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.platform" version="2.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.apache.xerces"/>
+      <import plugin="org.eclipse.search"/>
+      <import plugin="org.eclipse.compare"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.team.core"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.debug.ui"/>
    </requires>
 
    <plugin
          id="org.eclipse.cdt.core"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.ui"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.debug.core"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.debug.mi.core"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.debug.ui"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.launch"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.debug.mi.ui"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.doc.user"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
 </feature>
diff --git a/releng/org.eclipse.cdt-feature/plugin.xml b/releng/org.eclipse.cdt-feature/plugin.xml
deleted file mode 100644
index 38beabb52f2..00000000000
--- a/releng/org.eclipse.cdt-feature/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt-feature"
-   name="Cdt-feature"
-   version="1.0.0">
-
-   <runtime>
-   </runtime>
-
-</plugin>
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index d3d4546d687..71e0f002528 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.testing"
       label="%featureName"
-      version="1.2.0"
+      version="2.0.0"
       provider-name="%providerName"
       os=""
       ws=""
@@ -22,33 +22,50 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.platform" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt" version="1.2.0" match="equivalent"/>
-      <import plugin="org.eclipse.test" version="2.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.apache.xerces"/>
+      <import plugin="org.eclipse.core.boot"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.junit"/>
+      <import plugin="org.eclipse.cdt.debug.core"/>
+      <import plugin="org.eclipse.cdt.debug.mi.core"/>
+      <import plugin="org.eclipse.cdt.core"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.update.core"/>
+      <import plugin="org.eclipse.cdt.ui"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
+      <import plugin="org.eclipse.cdt.make.core"/>
+      <import plugin="org.eclipse.test"/>
    </requires>
 
    <plugin
          id="org.eclipse.cdt.debug.ui.tests"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.ui.tests"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.testing"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
    <plugin
          id="org.eclipse.cdt.core.tests"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="2.0.0"/>
 
 </feature>
diff --git a/releng/org.eclipse.cdt.testing-feature/plugin.xml b/releng/org.eclipse.cdt.testing-feature/plugin.xml
deleted file mode 100644
index 7f9a5d27890..00000000000
--- a/releng/org.eclipse.cdt.testing-feature/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.testing-feature"
-   name="Testing-feature"
-   version="1.0.0">
-
-   <runtime>
-   </runtime>
-
-</plugin>
diff --git a/releng/org.eclipse.cdt.testing/plugin.xml b/releng/org.eclipse.cdt.testing/plugin.xml
index 0b524685bb0..4512b7b1042 100644
--- a/releng/org.eclipse.cdt.testing/plugin.xml
+++ b/releng/org.eclipse.cdt.testing/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.testing"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName">
 
    <runtime>
diff --git a/releng/org.eclipse.cdt/plugin.xml b/releng/org.eclipse.cdt/plugin.xml
index 6bd4a83e39b..473527e4760 100644
--- a/releng/org.eclipse.cdt/plugin.xml
+++ b/releng/org.eclipse.cdt/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName">
 
    <runtime>