Author: davidb
Date: Wed May 27 10:22:00 2009
New Revision: 779085
URL: http://svn.apache.org/viewvc?rev=779085&view=rev
Log:
Added exclude transitive dependencies from Felix to osgi-foundation that were
upsetting Eclipse when used as imported projects.
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
cxf/dosgi/trunk/discovery/local/pom.xml
cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
cxf/dosgi/trunk/samples/greeter/client/pom.xml
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml?rev=779085&r1=779084&r2=779085&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Wed May 27
10:22:00 2009
@@ -42,6 +42,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: cxf/dosgi/trunk/discovery/local/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/pom.xml?rev=779085&r1=779084&r2=779085&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/local/pom.xml Wed May 27 10:22:00 2009
@@ -47,6 +47,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=779085&r1=779084&r2=779085&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Wed May 27 10:22:00 2009
@@ -52,6 +52,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
Modified: cxf/dosgi/trunk/samples/greeter/client/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/client/pom.xml?rev=779085&r1=779084&r2=779085&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/client/pom.xml Wed May 27 10:22:00 2009
@@ -52,6 +52,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
