Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Powell2010-09-17 15:08:22 +0000
committerSteve Powell2010-09-17 15:15:09 +0000
commit95f4f6de837d528fa0779a6795dde808df38c35a (patch)
tree0022b183b6b58ac878c33b3e9dc69832a55782b5 /org.eclipse.virgo.kernel.test/ivy.xml
parent61738ad048b124afc067295227b292ccd9c7de9d (diff)
downloadorg.eclipse.virgo.kernel-95f4f6de837d528fa0779a6795dde808df38c35a.tar.gz
org.eclipse.virgo.kernel-95f4f6de837d528fa0779a6795dde808df38c35a.tar.xz
org.eclipse.virgo.kernel-95f4f6de837d528fa0779a6795dde808df38c35a.zip
Merge branch 'bug322774'
Conflicts: org.eclipse.virgo.kernel.test/ivy.xml
Diffstat (limited to 'org.eclipse.virgo.kernel.test/ivy.xml')
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml9
1 files changed, 2 insertions, 7 deletions
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index 34cf7cf1..3293a518 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -25,10 +25,10 @@
<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.kernel" name="org.eclipse.virgo.kernel.dm" rev="latest.integration" conf="test->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.core" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="latest.integration" conf="test->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.shell" rev="latest.integration" conf="test->runtime"/>
-<!-- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="test->compile"/>-->
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
@@ -46,11 +46,6 @@
<!-- Prevent Xerces from being on the classpath to work around Java bug 6723276 during integration testing -->
<exclude org="org.apache.xerces"/>
-<!-- <override org="org.springframework" rev="${org.springframework}"/>-->
-<!-- <override org="org.eclipse.virgo.osgi" rev="${org.eclipse.virgo.osgi}"/>-->
-<!-- <override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>-->
-<!-- <override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>-->
-
</dependencies>
</ivy-module>

Back to the top