Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2011-02-01 22:14:39 +0000
committerGlyn Normington2011-02-01 22:14:39 +0000
commit41173c4d0a1fcffe4bb10180e78a202161138fe5 (patch)
treed24d5c2d19ae6ffa94f1bf1c54b7849a00997060 /build-kernel/kernel-ivy.xml
parent08e329f6cb2ea607f4990cb6e5468a3b4e614f00 (diff)
parent3304adff3025d3cd8a130b9ecb79d2153b444271 (diff)
downloadorg.eclipse.virgo.kernel-41173c4d0a1fcffe4bb10180e78a202161138fe5.tar.gz
org.eclipse.virgo.kernel-41173c4d0a1fcffe4bb10180e78a202161138fe5.tar.xz
org.eclipse.virgo.kernel-41173c4d0a1fcffe4bb10180e78a202161138fe5.zip
Merge branch 'master' into bug330776-framework-hooks
Conflicts: org.eclipse.virgo.kernel.agent.dm/.classpath org.eclipse.virgo.kernel.deployer.test/.classpath org.eclipse.virgo.kernel.shell/.classpath org.eclipse.virgo.kernel.test/.classpath org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
Diffstat (limited to 'build-kernel/kernel-ivy.xml')
-rw-r--r--build-kernel/kernel-ivy.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/build-kernel/kernel-ivy.xml b/build-kernel/kernel-ivy.xml
index 96a87564..4353289b 100644
--- a/build-kernel/kernel-ivy.xml
+++ b/build-kernel/kernel-ivy.xml
@@ -16,9 +16,10 @@
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="lib-kernel->runtime"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.userregionfactory" rev="latest.integration" conf="lib-kernel->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.org.apache.commons.logging" rev="${org.slf4j}" conf="lib-kernel->runtime"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="lib-kernel->runtime"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="lib-kernel->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="lib-kernel->runtime"/>
<dependency org="org.eclipse.equinox" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="lib-kernel->runtime"/>
+ <dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.console" rev="${org.eclipse.virgo.osgi}" conf="lib-kernel->runtime"/>
<!-- repository-ext -->

Back to the top