servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1400774 - in /servicemix/smx4/nmr/trunk: pom.xml testing/support/pom.xml
Date Mon, 22 Oct 2012 06:39:01 GMT
Author: ffang
Date: Mon Oct 22 06:39:00 2012
New Revision: 1400774

URL: http://svn.apache.org/viewvc?rev=1400774&view=rev
Log:
[SMX4NMR-303]ensure nmr testing/support can pull in correct spring version 

Modified:
    servicemix/smx4/nmr/trunk/pom.xml
    servicemix/smx4/nmr/trunk/testing/support/pom.xml

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1400774&r1=1400773&r2=1400774&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Mon Oct 22 06:39:00 2012
@@ -208,6 +208,19 @@
             <version>${spring.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+   
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+
         <!-- Spring OSGi -->
         <dependency>
             <groupId>org.springframework.osgi</groupId>

Modified: servicemix/smx4/nmr/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/pom.xml?rev=1400774&r1=1400773&r2=1400774&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/testing/support/pom.xml Mon Oct 22 06:39:00 2012
@@ -89,14 +89,28 @@
         <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-test</artifactId>
-            <!-- this dep pulls org.springframework.test 2.5.6.A, it should be excluded
but a testcase depends on it 
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
                     <artifactId>org.springframework.test</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>org.springframework.aop</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>org.springframework.beans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>org.springframework.context</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>org.springframework.core</artifactId>
+                </exclusion>
             </exclusions>
-            -->            
         </dependency>
         <dependency>
             <groupId>org.springframework.osgi</groupId>
@@ -130,6 +144,14 @@
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-mvn</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -143,7 +165,6 @@
                         <Bundle-Description>${project.description}</Bundle-Description>
                         <Import-Package>
                             javax.management,
-                            org.springframework.jmx.support;version="${spring.import.range}",
                             org.apache.felix*;resolution:=optional,
                             org.apache.servicemix.platform.main;resolution:=optional,
                             org.apache.servicemix.platform.main.spi;resolution:=optional;version="1.0.0",



Mime
View raw message