Author: rfeng
Date: Tue Apr 14 22:12:36 2009
New Revision: 764979
URL: http://svn.apache.org/viewvc?rev=764979&view=rev
Log:
Exclude the module that has conflicting classes with the JDK
Modified:
tuscany/branches/sca-java-1.x/modules/extensibility-osgi/pom.xml
tuscany/branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml
Modified: tuscany/branches/sca-java-1.x/modules/extensibility-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/extensibility-osgi/pom.xml?rev=764979&r1=764978&r2=764979&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/extensibility-osgi/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/extensibility-osgi/pom.xml Tue Apr 14
22:12:36 2009
@@ -44,6 +44,12 @@
<artifactId>org.apache.felix.framework</artifactId>
<version>1.0.4</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
Modified: tuscany/branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml?rev=764979&r1=764978&r2=764979&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml Tue Apr 14
22:12:36 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>
<dependency>
