Author: gnodet
Date: Thu Sep 25 06:20:46 2008
New Revision: 698959
URL: http://svn.apache.org/viewvc?rev=698959&view=rev
Log:
Exclude the junit bundle from springsource
Modified:
servicemix/smx4/kernel/trunk/pom.xml
servicemix/smx4/kernel/trunk/testing/support/pom.xml
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=698959&r1=698958&r2=698959&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Thu Sep 25 06:20:46 2008
@@ -163,6 +163,31 @@
<version>${spring.version}</version>
</dependency>
<dependency>
+ <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>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-annotation</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>${junit.version}</version>
Modified: servicemix/smx4/kernel/trunk/testing/support/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/pom.xml?rev=698959&r1=698958&r2=698959&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/support/pom.xml Thu Sep 25 06:20:46
2008
@@ -77,27 +77,14 @@
<dependency>
<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.springframework.osgi</groupId>
- <artifactId>junit.osgi</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-extender</artifactId>
- <version>${spring.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-annotation</artifactId>
- <version>${spring.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
