Index: assemblies/features/standard/src/main/feature/feature.xml
===================================================================
--- assemblies/features/standard/src/main/feature/feature.xml	(revision 1127017)
+++ assemblies/features/standard/src/main/feature/feature.xml	(working copy)
@@ -17,20 +17,6 @@
       limitations under the License.
 -->
 <features name="karaf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
-    <feature name="spring" version="${spring2.version}" resolver="(obr)" start-level='30'>
-        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle>mvn:org.springframework/spring-core/${spring2.version}</bundle>
-        <bundle>mvn:org.springframework/spring-beans/${spring2.version}</bundle>
-        <bundle>mvn:org.springframework/spring-aop/${spring2.version}</bundle>
-        <bundle>mvn:org.springframework/spring-context/${spring2.version}</bundle>
-        <bundle>mvn:org.springframework/spring-context-support/${spring2.version}</bundle>
-    </feature>
-    <feature name="spring-web" version="${spring2.version}" resolver="(obr)" start-level='30'>
-    	<feature version="${spring2.version}">spring</feature>
-    	<feature version="${project.version}">http</feature>
-    	<bundle>mvn:org.springframework/spring-web/${spring2.version}</bundle>
-		<bundle>mvn:org.springframework/spring-webmvc/${spring2.version}</bundle>
-    </feature>
     <feature name="spring" version="${spring.version}" resolver="(obr)" start-level='30'>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
         <bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>