Author: rfeng
Date: Thu Apr 30 00:42:26 2009
New Revision: 770022
URL: http://svn.apache.org/viewvc?rev=770022&view=rev
Log:
Add exclusion to avoid the conflicting jdk classes from felix
Modified:
tuscany/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml
tuscany/branches/sca-java-1.x/itest/osgi-implementation/pom.xml
Modified:
tuscany/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml?rev=770022&r1=770021&r2=770022&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml
(original)
+++
tuscany/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml
Thu Apr 30 00:42:26 2009
@@ -78,12 +78,24 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>1.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
Modified: tuscany/branches/sca-java-1.x/itest/osgi-implementation/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/osgi-implementation/pom.xml?rev=770022&r1=770021&r2=770022&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/osgi-implementation/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/itest/osgi-implementation/pom.xml Thu Apr 30
00:42:26 2009
@@ -52,6 +52,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -59,6 +63,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>1.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
