You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2011/01/18 08:35:19 UTC

svn commit: r1060224 - in /servicemix/smx4/nmr/trunk: jbi/deployer/pom.xml jbi/itests/pom.xml nmr/audit/pom.xml pom.xml

Author: ffang
Date: Tue Jan 18 07:35:18 2011
New Revision: 1060224

URL: http://svn.apache.org/viewvc?rev=1060224&view=rev
Log:
[SMX4NMR-248]nmr itests failure due to missing dependencies

Modified:
    servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
    servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
    servicemix/smx4/nmr/trunk/pom.xml

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=1060224&r1=1060223&r2=1060224&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Tue Jan 18 07:35:18 2011
@@ -80,8 +80,11 @@
         <dependency>
           <groupId>org.apache.servicemix</groupId>
           <artifactId>servicemix-common</artifactId>
-      </dependency>
-
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=1060224&r1=1060223&r2=1060224&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Tue Jan 18 07:35:18 2011
@@ -269,6 +269,10 @@
             <groupId>org.apache.servicemix.naming</groupId>
             <artifactId>org.apache.servicemix.naming</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/pom.xml?rev=1060224&r1=1060223&r2=1060224&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/pom.xml Tue Jan 18 07:35:18 2011
@@ -68,6 +68,11 @@
             <artifactId>derby</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
   
     <build>

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1060224&r1=1060223&r2=1060224&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Jan 18 07:35:18 2011
@@ -131,7 +131,7 @@
       <woodstox.version>4.0.8</woodstox.version>
       <woodstox.stax2-api.version>3.0.2</woodstox.stax2-api.version>
       <xbean.version>3.7</xbean.version>
-
+      <equinox.version>3.6.0.v20100517</equinox.version>
       <!-- Maven Plugins -->
       <depends-maven-plugin.version>1.2</depends-maven-plugin.version>
       <!-- 
@@ -521,6 +521,20 @@
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-test</artifactId>
             <version>${spring.osgi.version}</version>
+            <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework.osgi</groupId>
+                        <artifactId>asm.osgi</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.junit</groupId>
+                        <artifactId>com.springsource.junit</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.objectweb.asm</groupId>
+                        <artifactId>com.springsource.org.objectweb.asm</artifactId>
+                    </exclusion>
+             </exclusions>
         </dependency>
         
         <!-- PAX Exam -->
@@ -682,7 +696,11 @@
             <artifactId>jencks</artifactId>
             <version>${jencks.version}</version>
         </dependency>
-        
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>${equinox.version}</version>
+        </dependency>
     </dependencies>
   </dependencyManagement>