diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-04-14 22:12:36 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-04-14 22:12:36 +0000 |
| commit | 94376722d438488d93fc325381267610697afd61 (patch) | |
| tree | 520907645d481464c4c8ffc81d73f7a5d2e65fa3 | |
| parent | b091e96bb4da0365bde5d0ddcf0f4def583da251 (diff) | |
Exclude the module that has conflicting classes with the JDK
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@764979 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | branches/sca-java-1.x/modules/extensibility-osgi/pom.xml | 6 | ||||
| -rw-r--r-- | branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/branches/sca-java-1.x/modules/extensibility-osgi/pom.xml b/branches/sca-java-1.x/modules/extensibility-osgi/pom.xml index 7cecd907e3..ca0cb33617 100644 --- a/branches/sca-java-1.x/modules/extensibility-osgi/pom.xml +++ b/branches/sca-java-1.x/modules/extensibility-osgi/pom.xml @@ -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> diff --git a/branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml b/branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml index 6a52984c9f..daa1aed2a9 100644 --- a/branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml +++ b/branches/sca-java-1.x/modules/node-launcher-osgi/pom.xml @@ -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> |