Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-11-19 10:23:10 +0000
committerGlyn Normington2010-11-24 09:50:09 +0000
commit037396a88bdb7740b4115a19aa248e5110ce42cc (patch)
treed484378f92dd2586e8d344f1fd4fea67ac83df6f /org.eclipse.virgo.kernel.test/ivy.xml
parenta3f8eec0912c1689dcfb7fd629ef1cf4408d4f48 (diff)
downloadorg.eclipse.virgo.kernel-037396a88bdb7740b4115a19aa248e5110ce42cc.tar.gz
org.eclipse.virgo.kernel-037396a88bdb7740b4115a19aa248e5110ce42cc.tar.xz
org.eclipse.virgo.kernel-037396a88bdb7740b4115a19aa248e5110ce42cc.zip
bug 310217: use Equinox instead of Felix config admin
Diffstat (limited to 'org.eclipse.virgo.kernel.test/ivy.xml')
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index 3293a518..f7186e9b 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -18,7 +18,9 @@
<dependencies>
<!-- build -->
- <dependency org="org.apache.felix" name="org.apache.felix.configadmin" rev="${org.apache.felix}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.equinox" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="compile->runtime"/>
+
<dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="compile->runtime"/>
<!-- testing -->
@@ -46,6 +48,8 @@
<!-- Prevent Xerces from being on the classpath to work around Java bug 6723276 during integration testing -->
<exclude org="org.apache.xerces"/>
+ <!-- Allow Equinox to be upgraded point-wise before rippling -->
+ <override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
</dependencies>
</ivy-module>

Back to the top