svn commit: r1230975 - /karaf/trunk/pom.xml

[jb...@apache.org]

Author: jbonofre
Date: Fri Jan 13 10:17:34 2012
New Revision: 1230975

URL: http://svn.apache.org/viewvc?rev=1230975&view=rev
Log:
[KARAF-1120] Upgrade to Spring 3.1.0.RELEASE and fix dual Felix metatype artifact definition

Modified:
    karaf/trunk/pom.xml

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1230975&r1=1230974&r2=1230975&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Fri Jan 13 10:17:34 2012
@@ -189,7 +189,7 @@
         <slf4j.version>1.6.1</slf4j.version>
         <servicemix.specs.version>1.9.0</servicemix.specs.version>
         <spring.osgi.version>1.2.1</spring.osgi.version>
-        <spring.version>3.0.6.RELEASE</spring.version>
+        <spring.version>3.1.0.RELEASE</spring.version>
         <sshd.version>0.6.0</sshd.version>
         <xbean.version>3.8</xbean.version>
         <javax.mail.version>1.4.4</javax.mail.version>
@@ -814,11 +814,6 @@
                 <version>${felix.scr.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.metatype</artifactId>
-                <version>${felix.metatype.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>biz.aQute</groupId>
                 <artifactId>bndlib</artifactId>
                 <version>${bndlib.version}</version>