summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/itest/osgi-contribution/contribution-test
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-04-22 21:36:47 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-04-22 21:36:47 +0000
commitbaa5887866a52cd40be16707d9741cbbad9d7263 (patch)
treeee59ecec6c1f2eb99171f32a4c0ef01fba3fbe6b /branches/sca-java-1.x/itest/osgi-contribution/contribution-test
parentbea3315cf03c50f49fb7e195180a797d098789d6 (diff)
Add exclusion to avoid the conflicting jdk classes from felix
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@767674 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/itest/osgi-contribution/contribution-test')
-rw-r--r--branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml12
1 files changed, 9 insertions, 3 deletions
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml b/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml
index 005877466d..9778c19e01 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml
+++ b/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml
@@ -7,15 +7,15 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
@@ -66,6 +66,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
<version>1.0.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>