Bug 322533 - Bring snaps up to date with Virgo at 2.1.0.M03-incubation

6 files changed, 38 insertions, 39 deletions

diff --git a/build.versions b/build.versions
index 432233e..fd33a2a 100644
--- a/build.versions
+++ b/build.versions
@@ -1,23 +1,23 @@
 # Compile
 org.eclipse.osgi=3.5.1.R35x_v20091005
-org.slf4j=1.5.10
+org.slf4j=1.6.1
 org.tuckey=3.1.0
 javax.persistence=1.0.0
 javax.servlet=2.5.0
 javax.servlet.jsp=2.1.0
 org.springframework=3.0.0.RELEASE
 org.springframework.webflow=2.0.7.RELEASE
-org.eclipse.virgo.kernel=2.1.0.M02-incubation
-org.eclipse.virgo.util=2.1.0.M02-incubation
-org.eclipse.virgo.repository=2.1.0.M02-incubation
+org.eclipse.virgo.kernel=2.1.0.M03-incubation
+org.eclipse.virgo.util=2.1.0.M03-incubation
+org.eclipse.virgo.repository=2.1.0.M03-incubation
 org.eclipse.gemini.web=1.1.0.M02-incubation
-org.eclipse.virgo.test=2.1.0.M02-incubation
-org.eclipse.virgo.web=2.1.0.M02-incubation
-org.eclipse.virgo.osgi=2.1.0.M02-incubation
+org.eclipse.virgo.test=2.1.0.M03-incubation
+org.eclipse.virgo.web=2.1.0.M03-incubation
+org.eclipse.virgo.osgi=2.1.0.M03-incubation
 
 
 # Test
-org.eclipse.virgo.medic=2.1.0.M02-incubation
+org.eclipse.virgo.medic=2.1.0.M03-incubation
 org.apache.commons.codec=1.3.0
 org.apache.commons.httpclient=3.1.0
 org.apache.felix.configadmin=1.0.10
@@ -27,7 +27,7 @@ org.apache.taglibs=1.1.2
 org.junit=4.7.0
 org.easymock=2.3.0
 net.sourceforge.jwebunit=2.1.0
-org.eclipse.virgo.teststubs.osgi=2.1.0.M02-incubation
+org.eclipse.virgo.teststubs.osgi=2.1.0.M03-incubation
 org.apache.felix.eventadmin=1.0.0
 org.apache.felix=1.2.4
 org.springframework.osgi=1.2.1
diff --git a/org.eclipse.virgo.snaps.api/.classpath b/org.eclipse.virgo.snaps.api/.classpath
index 4d77074..eef9b21 100644
--- a/org.eclipse.virgo.snaps.api/.classpath
+++ b/org.eclipse.virgo.snaps.api/.classpath
@@ -30,6 +30,6 @@
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.6.RELEASE.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M03-incubation/org.eclipse.virgo.teststubs.osgi-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M03-incubation/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.M03-incubation.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.snaps.core/.classpath b/org.eclipse.virgo.snaps.core/.classpath
index 4dc9f23..03240f0 100644
--- a/org.eclipse.virgo.snaps.core/.classpath
+++ b/org.eclipse.virgo.snaps.core/.classpath
@@ -26,25 +26,25 @@
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-sources-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-sources-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M02-incubation/org.eclipse.virgo.kernel.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M02-incubation/org.eclipse.virgo.kernel.osgi-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M03-incubation/org.eclipse.virgo.kernel.deployer-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M03-incubation/org.eclipse.virgo.kernel.deployer-sources-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M03-incubation/org.eclipse.virgo.util.osgi-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M03-incubation/org.eclipse.virgo.util.osgi-sources-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M03-incubation/org.eclipse.virgo.kernel.osgi-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M03-incubation/org.eclipse.virgo.kernel.osgi-sources-2.1.0.M03-incubation.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-1.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-sources-1.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M03-incubation/org.eclipse.virgo.util.io-2.1.0.M03-incubation.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M02-incubation/org.eclipse.gemini.web.tomcat-1.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M02-incubation/org.eclipse.gemini.web.tomcat-sources-1.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M02-incubation/org.eclipse.virgo.util.common-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M03-incubation/org.eclipse.virgo.util.common-2.1.0.M03-incubation.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-6.0.20.S2-r5956.jar" sourcepath="/SNAPS_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-sources-6.0.20.S2-r5956.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M02-incubation/org.eclipse.virgo.util.parser.manifest-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M02-incubation/org.eclipse.virgo.util.parser.manifest-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M03-incubation/org.eclipse.virgo.teststubs.osgi-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M03-incubation/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M03-incubation/org.eclipse.virgo.util.parser.manifest-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M03-incubation/org.eclipse.virgo.util.parser.manifest-sources-2.1.0.M03-incubation.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-1.5.10.jar" sourcepath="/SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-sources-1.5.10.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/2.1.0.M02-incubation/org.eclipse.virgo.medic.core-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/2.1.0.M02-incubation/org.eclipse.virgo.medic.test-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.0.CI-B20/org.eclipse.virgo.medic.test-sources-1.0.0.CI-B20.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M02-incubation/org.eclipse.virgo.medic-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M02-incubation/org.eclipse.virgo.kernel.artifact-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M02-incubation/org.eclipse.virgo.kernel.artifact-sources-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/2.1.0.M03-incubation/org.eclipse.virgo.medic.core-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/2.1.0.M03-incubation/org.eclipse.virgo.medic.test-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.0.CI-B20/org.eclipse.virgo.medic.test-sources-1.0.0.CI-B20.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M03-incubation/org.eclipse.virgo.medic-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M03-incubation/org.eclipse.virgo.kernel.artifact-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M03-incubation/org.eclipse.virgo.kernel.artifact-sources-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M03-incubation/org.eclipse.virgo.kernel.core-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M03-incubation/org.eclipse.virgo.kernel.core-sources-2.1.0.M03-incubation.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.snaps.core/template.mf b/org.eclipse.virgo.snaps.core/template.mf
index 95bcbe5..527652c 100644
--- a/org.eclipse.virgo.snaps.core/template.mf
+++ b/org.eclipse.virgo.snaps.core/template.mf
@@ -12,7 +12,7 @@ Import-Template:
  javax.servlet.jsp.*;version="2.1",
  javax.xml.parsers.*;version="0",
  org.apache.catalina.*;version="[6.0,6.1)",
- org.slf4j.*;version="[1.5.6, 1.6)",
+ org.slf4j.*;version="${org.slf4j:[=.=.=, +1)}",
  org.osgi.framework.*;version="[1.5, 2.0)",
  org.osgi.util.tracker;version="[1.4.2, 1.5)",
  org.w3c.dom.*;version="0",
diff --git a/org.eclipse.virgo.snaps.test/.classpath b/org.eclipse.virgo.snaps.test/.classpath
index 7ee484a..6facb04 100644
--- a/org.eclipse.virgo.snaps.test/.classpath
+++ b/org.eclipse.virgo.snaps.test/.classpath
@@ -6,15 +6,15 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M02-incubation/org.eclipse.virgo.test.framework-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M02-incubation/org.eclipse.virgo.test.framework-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M03-incubation/org.eclipse.virgo.test.framework-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M03-incubation/org.eclipse.virgo.test.framework-sources-2.1.0.M03-incubation.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M02-incubation/org.eclipse.virgo.util.common-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-sources-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-sources-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer.core-sources-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M03-incubation/org.eclipse.virgo.util.common-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M03-incubation/org.eclipse.virgo.util.osgi-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M03-incubation/org.eclipse.virgo.util.osgi-sources-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M03-incubation/org.eclipse.virgo.kernel.core-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M03-incubation/org.eclipse.virgo.kernel.core-sources-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M03-incubation/org.eclipse.virgo.kernel.deployer-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/2.1.0.M03-incubation/org.eclipse.virgo.kernel.deployer.core-sources-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M03-incubation/org.eclipse.virgo.util.io-2.1.0.M03-incubation.jar"/>
 	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M02-incubation/org.eclipse.virgo.osgi.launcher-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M02-incubation/org.eclipse.virgo.osgi.launcher-sources-2.1.0.M02-incubation.jar"/>
-	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M02-incubation/org.eclipse.virgo.osgi.extensions.equinox-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M02-incubation/org.eclipse.virgo.osgi.extensions.equinox-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M03-incubation/org.eclipse.virgo.osgi.launcher-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M03-incubation/org.eclipse.virgo.osgi.launcher-sources-2.1.0.M03-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M03-incubation/org.eclipse.virgo.osgi.extensions.equinox-2.1.0.M03-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M03-incubation/org.eclipse.virgo.osgi.extensions.equinox-sources-2.1.0.M03-incubation.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 461b0bf..438c55c 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -9,10 +9,10 @@ baseBundles = \
  file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar@start,\
  file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar,\
  file:../ivy-cache/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/2.1.0.M02-incubation/org.eclipse.virgo.kernel.agent.dm-2.1.0.M02-incubation.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer.dm-2.1.0.M02-incubation.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/2.1.0.M02-incubation/org.eclipse.virgo.kernel.dmfragment-2.1.0.M02-incubation.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/2.1.0.M02-incubation/org.eclipse.virgo.kernel.userregion-2.1.0.M02-incubation.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/2.1.0.M03-incubation/org.eclipse.virgo.kernel.agent.dm-2.1.0.M03-incubation.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/2.1.0.M03-incubation/org.eclipse.virgo.kernel.deployer.dm-2.1.0.M03-incubation.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/2.1.0.M03-incubation/org.eclipse.virgo.kernel.dmfragment-2.1.0.M03-incubation.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/2.1.0.M03-incubation/org.eclipse.virgo.kernel.userregion-2.1.0.M03-incubation.jar@start,\
 
 packageImports =\
  org.eclipse.virgo.kernel.artifact.*;version="0",\
@@ -36,8 +36,7 @@ packageImports =\
  org.aspectj.*;version="[1.6.6.RELEASE,2.0.0)",\
  org.osgi.service.cm;version="0",\
  org.osgi.service.event;version="0",\
- org.slf4j;version="[1.5.10,2)",\
- org.slf4j.spi;version="[1.5.10,2)",\
+ org.slf4j;version="[1.6.1,2)",\
  org.junit,\
  org.junit.*