svn commit: r906213 - in /james/server/trunk: osgi-deployment/ pom.xml

[bago]

Author: bago
Date: Wed Feb  3 20:07:06 2010
New Revision: 906213

URL: http://svn.apache.org/viewvc?rev=906213&view=rev
Log:
Add dependency exclusions (weird org.springframework changes in artifactIds). 
Add svn ignore for osgi-deployment/target.

Modified:
    james/server/trunk/osgi-deployment/   (props changed)
    james/server/trunk/pom.xml

Propchange: james/server/trunk/osgi-deployment/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb  3 20:07:06 2010
@@ -0,0 +1 @@
+target

Modified: james/server/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=906213&r1=906212&r2=906213&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Feb  3 20:07:06 2010
@@ -747,11 +747,47 @@
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-core</artifactId>
       <version>1.2.1</version>
+      <exclusions>
+       <exclusion>
+         <groupId>org.springframework</groupId>
+         <artifactId>org.springframework.core</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.aop</artifactId>
+       </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-extender</artifactId>
       <version>1.2.1</version>
+      <exclusions>
+       <exclusion>
+         <groupId>org.springframework</groupId>
+         <artifactId>org.springframework.core</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.aop</artifactId>
+       </exclusion>
+      </exclusions>
     </dependency>  
     
     <dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org