Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-11-17 21:36:22 +0000
committerGlyn Normington2010-11-17 21:36:22 +0000
commit974dcdf3c96ecb1c2eb82721f094e1f1c3099bdd (patch)
treee562aace9117ec8f62f3608c40c351e367fb6278 /org.eclipse.virgo.medic.core/ivy.xml
parentf6b04073764e8b8e8a7dfb1854de68264e89aef6 (diff)
downloadorg.eclipse.virgo.medic-974dcdf3c96ecb1c2eb82721f094e1f1c3099bdd.tar.gz
org.eclipse.virgo.medic-974dcdf3c96ecb1c2eb82721f094e1f1c3099bdd.tar.xz
org.eclipse.virgo.medic-974dcdf3c96ecb1c2eb82721f094e1f1c3099bdd.zip
bug 310217: use Equinox instead of Felix for Config Adminequinox-config-admin
Diffstat (limited to 'org.eclipse.virgo.medic.core/ivy.xml')
-rw-r--r--org.eclipse.virgo.medic.core/ivy.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.virgo.medic.core/ivy.xml b/org.eclipse.virgo.medic.core/ivy.xml
index 18d4da4..38a5ef1 100644
--- a/org.eclipse.virgo.medic.core/ivy.xml
+++ b/org.eclipse.virgo.medic.core/ivy.xml
@@ -27,11 +27,15 @@
<dependency org="ch.qos.logback" name="com.springsource.ch.qos.logback.core" rev="${ch.qos.logback}" conf="provided, additional->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
- <dependency org="org.apache.felix" name="org.apache.felix.configadmin" rev="${org.apache.felix.configadmin}" conf="optional->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="optional->runtime"/>
+ <dependency org="org.eclipse.equinox" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="optional->runtime"/>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs}" conf="test->runtime"/>
+
+ <!-- Prevent org.eclipse.osgi.services dragging in old Equinox -->
+ <override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
</dependencies>
</ivy-module>

Back to the top