Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-11-19 05:23:10 -0500
committerGlyn Normington2010-11-24 04:50:09 -0500
commit037396a88bdb7740b4115a19aa248e5110ce42cc (patch)
treed484378f92dd2586e8d344f1fd4fea67ac83df6f /org.eclipse.virgo.kernel.agent.dm
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.agent.dm')
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/ivy.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/org.eclipse.virgo.kernel.agent.dm/ivy.xml b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
index a1d7b665..52391a06 100644
--- a/org.eclipse.virgo.kernel.agent.dm/ivy.xml
+++ b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
@@ -18,7 +18,10 @@
<dependency name='com.springsource.org.easymock' rev='${org.easymock}' org='org.easymock' conf='test->runtime'/>
<dependency name='org.eclipse.virgo.teststubs.osgi' rev='${org.eclipse.virgo.teststubs}' org='org.eclipse.virgo.teststubs' conf='test->runtime'/>
<dependency name='org.eclipse.osgi' rev='${org.eclipse.osgi}' org='org.eclipse.osgi' conf='compile->runtime'/>
- <dependency name='org.apache.felix.configadmin' rev='${org.apache.felix}' org='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.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="latest.integration" conf='compile->compile'/>
<dependency name='org.eclipse.virgo.util.io' rev='${org.eclipse.virgo.util}' org='org.eclipse.virgo.util' conf='compile->compile'/>
<dependency name='org.eclipse.virgo.util.osgi' rev='${org.eclipse.virgo.util}' org='org.eclipse.virgo.util' conf='compile->compile'/>
@@ -32,6 +35,9 @@
<dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="compile->compile"/>
<override org="org.springframework" rev="${org.springframework}"/>
<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
+
+ <!-- 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