diff --git a/build.versions b/build.versions
index cc91982..3750d50 100644
--- a/build.versions
+++ b/build.versions
@@ -7,11 +7,11 @@
 org.eclipse.equinox.region=1.0.0.v20110503
 org.aspectj=1.6.6.RELEASE
 org.eclipse.osgi=3.7.1.R37x_v20110808-1106
-org.eclipse.virgo.osgi=3.1.0.M01
-org.eclipse.virgo.medic=3.1.0.D-20111222170736
+org.eclipse.virgo.osgi=3.5.0.M02
+org.eclipse.virgo.medic=3.5.0.M02
 ch.qos.logback=0.9.28
-org.eclipse.virgo.repository=3.1.0.M01
-org.eclipse.virgo.util=3.1.0.M01
+org.eclipse.virgo.repository=3.5.0.M02
+org.eclipse.virgo.util=3.5.0.M02
 org.eclipse.virgo.build.tools=1.1.0.RELEASE
 org.slf4j=1.6.1
 org.slf4j.spi=1.6.1
@@ -69,5 +69,5 @@
 #Test
 org.easymock=2.3.0
 org.junit=4.7.0
-org.eclipse.virgo.teststubs=3.1.0.M01
+org.eclipse.virgo.teststubs=3.5.0.M02
 
diff --git a/org.eclipse.virgo.deployer.api/.classpath b/org.eclipse.virgo.deployer.api/.classpath
index 835a5d9..3035ace 100644
--- a/org.eclipse.virgo.deployer.api/.classpath
+++ b/org.eclipse.virgo.deployer.api/.classpath
@@ -21,7 +21,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.M01/org.eclipse.virgo.util.io-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M02/org.eclipse.virgo.util.io-3.5.0.M02.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.core"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.M01/org.eclipse.virgo.medic-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
diff --git a/org.eclipse.virgo.deployer.hot/.classpath b/org.eclipse.virgo.deployer.hot/.classpath
index da2ad16..2590e92 100644
--- a/org.eclipse.virgo.deployer.hot/.classpath
+++ b/org.eclipse.virgo.deployer.hot/.classpath
@@ -8,11 +8,11 @@
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-3.7.0.v20110613.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110224/org.eclipse.osgi-sources-3.7.0.v20110224.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.core"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.M01/org.eclipse.virgo.util.io-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M02/org.eclipse.virgo.util.io-3.5.0.M02.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111222170736/org.eclipse.virgo.medic-3.1.0.D-20111222170736.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M02/org.eclipse.virgo.medic-3.5.0.M02.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.deployer.api"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.1.0.D-20111222170736/org.eclipse.virgo.medic.test-3.1.0.D-20111222170736.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.M02/org.eclipse.virgo.medic.test-3.5.0.M02.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.virgo.kernel.core/.classpath b/org.eclipse.virgo.kernel.core/.classpath
index a314fbb..176636a 100644
--- a/org.eclipse.virgo.kernel.core/.classpath
+++ b/org.eclipse.virgo.kernel.core/.classpath
@@ -24,7 +24,7 @@
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.M01/org.eclipse.virgo.util.io-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M02/org.eclipse.virgo.util.io-3.5.0.M02.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.M01/org.eclipse.virgo.medic-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar">
 		<attributes>
@@ -32,10 +32,10 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.1.0.M01/org.eclipse.virgo.teststubs.osgi-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.1.0.M01/org.eclipse.virgo.teststubs.osgi-sources-3.1.0.M01.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.M02/org.eclipse.virgo.teststubs.osgi-3.5.0.M02.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.M02/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.M02.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/NANO_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20111205151812/org.eclipse.virgo.util.osgi-sources-3.1.0.D-20111205151812.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.M01/org.eclipse.virgo.util.common-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20111205151812/org.eclipse.virgo.util.common-sources-3.1.0.D-20111205151812.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M02/org.eclipse.virgo.util.osgi-3.5.0.M02.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20111205151812/org.eclipse.virgo.util.osgi-sources-3.1.0.D-20111205151812.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M02/org.eclipse.virgo.util.common-3.5.0.M02.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20111205151812/org.eclipse.virgo.util.common-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry exported="true" kind="var" path="NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.1.0.M01/org.eclipse.virgo.medic.test-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.1.0.D-20111205152504/org.eclipse.virgo.medic.test-sources-3.1.0.D-20111205152504.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
diff --git a/org.eclipse.virgo.nano.deployer/.classpath b/org.eclipse.virgo.nano.deployer/.classpath
index 52d96b4..277fa33 100644
--- a/org.eclipse.virgo.nano.deployer/.classpath
+++ b/org.eclipse.virgo.nano.deployer/.classpath
@@ -21,7 +21,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.M01/org.eclipse.virgo.util.io-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M02/org.eclipse.virgo.util.io-3.5.0.M02.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.core"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.M01/org.eclipse.virgo.medic-3.1.0.M01.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111205152504/org.eclipse.virgo.medic-sources-3.1.0.D-20111205152504.jar"/>
@@ -29,6 +29,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.deployer.hot"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/NANO_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/NANO_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.1.0.D-20111222170736/org.eclipse.virgo.medic.test-3.1.0.D-20111222170736.jar"/>
+	<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.M02/org.eclipse.virgo.medic.test-3.5.0.M02.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>