changed to use new 'common' version of plugins.

assembly/features/org.eclipse.wst.tests.feature/feature.xml

@@ -6,6 +6,7 @@
       provider-name="Eteration.com">
 
    <install-handler/>
+
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.core.runtime.compatibility" version="3.0.0" match="equivalent"/>
@@ -30,12 +31,6 @@
       <import plugin="org.eclipse.jface"/>
    </requires>
 
-   <plugin
-         id="org.eclipse.wst.contentmodel"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
-
    <plugin
          id="org.eclipse.wst.dtd.core"
          download-size="0"
@@ -48,12 +43,6 @@
          install-size="0"
          version="1.0.0"/>
 
-   <plugin
-         id="org.eclipse.wst.encoding"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
-
    <plugin
          id="org.eclipse.wst.monitor.core"
          download-size="0"
@@ -150,4 +139,16 @@
          install-size="0"
          version="1.0.0"/>
 
+   <plugin
+         id="org.eclipse.wst.common.encoding"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.common.contentmodel"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
 </feature>