You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2011/12/03 04:56:47 UTC

svn commit: r1209827 - in /karaf/trunk: ./ assemblies/apache-karaf/ assemblies/features/ assemblies/features/spring/ assemblies/features/spring/src/ assemblies/features/spring/src/main/ assemblies/features/spring/src/main/feature/ assemblies/features/s...

Author: djencks
Date: Sat Dec  3 03:56:46 2011
New Revision: 1209827

URL: http://svn.apache.org/viewvc?rev=1209827&view=rev
Log:
KARAF-1080 spring feature repo for spring related features

Added:
    karaf/trunk/assemblies/features/spring/
    karaf/trunk/assemblies/features/spring/pom.xml
      - copied, changed from r1209819, karaf/trunk/assemblies/features/pom.xml
    karaf/trunk/assemblies/features/spring/src/
    karaf/trunk/assemblies/features/spring/src/main/
    karaf/trunk/assemblies/features/spring/src/main/feature/
    karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml   (with props)
Modified:
    karaf/trunk/assemblies/apache-karaf/pom.xml
    karaf/trunk/assemblies/features/pom.xml
    karaf/trunk/assemblies/features/standard/pom.xml
    karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
    karaf/trunk/pom.xml

Modified: karaf/trunk/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/pom.xml?rev=1209827&r1=1209826&r2=1209827&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/pom.xml Sat Dec  3 03:56:46 2011
@@ -51,6 +51,13 @@
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
+            <artifactId>spring</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
             <artifactId>enterprise</artifactId>
             <classifier>features</classifier>
             <type>xml</type>

Modified: karaf/trunk/assemblies/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/pom.xml?rev=1209827&r1=1209826&r2=1209827&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/pom.xml (original)
+++ karaf/trunk/assemblies/features/pom.xml Sat Dec  3 03:56:46 2011
@@ -36,6 +36,7 @@
     <modules>
         <module>framework</module>
         <module>standard</module>
+        <module>spring</module>
         <module>enterprise</module>
     </modules>
 

Copied: karaf/trunk/assemblies/features/spring/pom.xml (from r1209819, karaf/trunk/assemblies/features/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/spring/pom.xml?p2=karaf/trunk/assemblies/features/spring/pom.xml&p1=karaf/trunk/assemblies/features/pom.xml&r1=1209819&r2=1209827&rev=1209827&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/pom.xml (original)
+++ karaf/trunk/assemblies/features/spring/pom.xml Sat Dec  3 03:56:46 2011
@@ -22,21 +22,44 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.karaf.assemblies</groupId>
-        <artifactId>assemblies</artifactId>
+        <groupId>org.apache.karaf.assemblies.features</groupId>
+        <artifactId>features</artifactId>
         <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.karaf.assemblies.features</groupId>
-    <artifactId>features</artifactId>
+    <groupId>org.apache.karaf.features</groupId>
+    <artifactId>spring</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Karaf :: Assemblies :: Features</name>
+    <name>Apache Karaf :: Assemblies :: Features :: Spring</name>
+    <description>Spring Support</description>
 
-    <modules>
-        <module>framework</module>
-        <module>standard</module>
-        <module>enterprise</module>
-    </modules>
+    <properties>
+        <appendedResourcesDirectory>${basedir}/../../../../etc/appended-resources</appendedResourcesDirectory>
+    </properties>
 
-</project>
\ No newline at end of file
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <configuration>
+                    <startLevel>30</startLevel>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>features-generate-descriptor</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml?rev=1209827&view=auto
==============================================================================
--- karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml (added)
+++ karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml Sat Dec  3 03:56:46 2011
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+      Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements.  See the NOTICE file distributed with
+      this work for additional information regarding copyright ownership.
+      The ASF licenses this file to You under the Apache License, Version 2.0
+      (the "License"); you may not use this file except in compliance with
+      the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+<features name="spring-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+
+    <!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml -->
+
+    <feature name="spring" description="Spring support" version="${spring.version}" resolver="(obr)">
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-core/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-asm/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-expression/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-aop/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-context/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-context-support/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-aspects" description="Spring AOP support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}" resolver="(obr)">
+        <feature version="[2.5.6,4)">spring</feature>
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+    </feature>
+
+    <feature name="spring-dm-web" description="Spring DM Web support" version="${spring.osgi.version}" resolver="(obr)">
+    	<feature version="${spring.osgi.version}">spring-dm</feature>
+    	<feature version="[2.5.6,4)">spring-web</feature>
+    	<feature version="${project.version}">http</feature>
+		<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
+    </feature>
+
+    <feature name="spring-instrument" description="Spring Instrument support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-jdbc" description="Spring JDBC support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring-tx</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-jms" description="Spring JMS support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring-web</feature>
+        <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-jms/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-tx/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-struts" description="Spring Struts support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring-web</feature>
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-struts/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-test" description="Spring Test support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-test/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-orm" description="Spring ORM support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-orm/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-oxm" description="Spring OXM support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-tx" description="Spring Transaction (TX) support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-tx/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-web" description="Spring Web support" version="${spring.version}" resolver="(obr)">
+    	<feature version="${spring.version}">spring</feature>
+    	<feature version="${project.version}">http</feature>
+    	<bundle start-level="30">mvn:org.springframework/spring-web/${spring.version}</bundle>
+		<bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
+    </feature>
+
+    <feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring-web</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring.version}</bundle>
+    </feature>
+
+    <feature name="gemini-blueprint" description="Gemini Blueprint Extender" version="${gemini.blueprint.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-io/${gemini.blueprint.version}</bundle>
+        <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-core/${gemini.blueprint.version}</bundle>
+        <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-extender/${gemini.blueprint.version}</bundle>
+    </feature>
+
+</features>

Propchange: karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: karaf/trunk/assemblies/features/standard/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/pom.xml?rev=1209827&r1=1209826&r2=1209827&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/pom.xml (original)
+++ karaf/trunk/assemblies/features/standard/pom.xml Sat Dec  3 03:56:46 2011
@@ -32,6 +32,7 @@
     <artifactId>standard</artifactId>
     <packaging>pom</packaging>
     <name>Apache Karaf :: Assemblies :: Features :: Standard</name>
+    <description>Standard providing core Karaf features</description>
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../../../etc/appended-resources</appendedResourcesDirectory>
@@ -63,6 +64,18 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>org.apache.karaf.admin</groupId>
+            <artifactId>org.apache.karaf.admin.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.admin</groupId>
+            <artifactId>org.apache.karaf.admin.command</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.admin</groupId>
+            <artifactId>org.apache.karaf.admin.management</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.karaf.diagnostic</groupId>
             <artifactId>org.apache.karaf.diagnostic.core</artifactId>
         </dependency>

Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1209827&r1=1209826&r2=1209827&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Sat Dec  3 03:56:46 2011
@@ -20,102 +20,6 @@
 
     <!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml -->
 
-    <feature name="spring" description="Spring support" version="${spring.version}" resolver="(obr)">
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-core/${spring.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-asm/${spring.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-expression/${spring.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-aop/${spring.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-context/${spring.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-context-support/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring AOP support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}" resolver="(obr)">
-        <feature version="[2.5.6,4)">spring</feature>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
-    </feature>
-
-    <feature name="spring-dm-web" description="Spring DM Web support" version="${spring.osgi.version}" resolver="(obr)">
-    	<feature version="${spring.osgi.version}">spring-dm</feature>
-    	<feature version="[2.5.6,4)">spring-web</feature>
-    	<feature version="${project.version}">http</feature>
-		<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring Instrument support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring JDBC support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring-tx</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring JMS support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring-web</feature>
-        <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-jms/${spring.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-tx/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-struts" description="Spring Struts support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring-web</feature>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
-        <bundle start-level="30">mvn:org.springframework/spring-struts/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring Test support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-test/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring ORM support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring-jdbc</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-orm/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring OXM support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring Transaction (TX) support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-tx/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring Web support" version="${spring.version}" resolver="(obr)">
-    	<feature version="${spring.version}">spring</feature>
-    	<feature version="${project.version}">http</feature>
-    	<bundle start-level="30">mvn:org.springframework/spring-web/${spring.version}</bundle>
-		<bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
-    </feature>
-
-    <feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring-web</feature>
-        <bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring.version}</bundle>
-    </feature>
-
-    <feature name="gemini-blueprint" description="Gemini Blueprint Extender" version="${gemini.blueprint.version}" resolver="(obr)">
-        <feature version="${spring.version}">spring</feature>
-        <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-io/${gemini.blueprint.version}</bundle>
-        <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-core/${gemini.blueprint.version}</bundle>
-        <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-extender/${gemini.blueprint.version}</bundle>
-    </feature>
-
     <feature name="wrapper" description="Provide OS integration" version="${project.version}">
         <bundle start-level="30">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.core/${project.version}</bundle>
         <bundle start-level="30">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.commands/${project.version}</bundle>
@@ -257,10 +161,4 @@
         <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${project.version}</bundle>
     </feature>
 
-    <feature name="standard" description="Standard providing core Karaf features" version="${project.version}">
-        <bundle start-level="30">mvn:org.apache.karaf.admin/org.apache.karaf.admin.core/${project.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.karaf.admin/org.apache.karaf.admin.command/${project.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.karaf.admin/org.apache.karaf.admin.management/${project.version}</bundle>
-    </feature>
-
 </features>

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1209827&r1=1209826&r2=1209827&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sat Dec  3 03:56:46 2011
@@ -601,7 +601,7 @@
             </dependency>
             <dependency>
               <groupId>org.apache.karaf.features</groupId>
-              <artifactId>standard</artifactId>
+              <artifactId>enterprise</artifactId>
               <type>xml</type>
               <classifier>features</classifier>
               <version>${project.version}</version>
@@ -614,7 +614,14 @@
             </dependency>
             <dependency>
               <groupId>org.apache.karaf.features</groupId>
-              <artifactId>enterprise</artifactId>
+              <artifactId>spring</artifactId>
+              <type>xml</type>
+              <classifier>features</classifier>
+              <version>${project.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.karaf.features</groupId>
+              <artifactId>standard</artifactId>
               <type>xml</type>
               <classifier>features</classifier>
               <version>${project.version}</version>