[107497] Tests package sdk with the jar

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

@@ -6,17 +6,11 @@
       provider-name="Eclipse.org">
    <install-handler/>
 
-   <includes
-         id="org.eclipse.jst.sdk"
-         version="0.7.0"
-         name="J2EE Standard Tools Feature and Web Standard Tools Feature SDK"/>
-
-   <includes
-         id="org.eclipse.wst.tests.feature"
-         version="0.7.0"
-         name="org.eclipse.wst.tests.feature"/>
 
    <requires>
+      <import feature="org.eclipse.wst.tests.feature" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jst.sdk" version="0.0.0" match="greaterOrEqual"/>
+      
       <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>

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

@@ -6,12 +6,10 @@
       provider-name="Eclipse.org">
    <install-handler/>
 
-   <includes
-         id="org.eclipse.wst.sdk"
-         version="0.7.0"
-         name="Web Standard Tools Feature SDK"/>
-
+ 
    <requires>
+      <import feature="org.eclipse.wst.sdk" version="0.0.0" match="greaterOrEqual"/>
+   
       <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.core" version="0.0.0" match="greaterOrEqual"/>