diff --git a/build.versions b/build.versions
index 7bd8729..564638c 100644
--- a/build.versions
+++ b/build.versions
@@ -1,10 +1,10 @@
-org.eclipse.virgo.util=3.5.0.D-20120424005002
+org.eclipse.virgo.util=3.5.0.M04
 org.aspectj=1.6.12.RELEASE
 org.slf4j=1.6.1
 org.eclipse.osgi=3.7.1.R37x_v20110808-1106
 org.apache.commons.httpclient=3.1.0
-org.eclipse.virgo.medic=3.5.0.D-20120424005802
+org.eclipse.virgo.medic=3.5.0.M04
 
 org.junit=4.7.0
 org.easymock=2.3.0
-org.eclipse.virgo.teststubs=3.5.0.D-20120424004248
+org.eclipse.virgo.teststubs=3.5.0.M04
diff --git a/org.eclipse.virgo.repository/.classpath b/org.eclipse.virgo.repository/.classpath
index 2edcaa0..0060af1 100644
--- a/org.eclipse.virgo.repository/.classpath
+++ b/org.eclipse.virgo.repository/.classpath
@@ -23,20 +23,20 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120424005002/org.eclipse.virgo.util.io-3.5.0.D-20120424005002.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120424005002/org.eclipse.virgo.util.io-sources-3.5.0.D-20120424005002.jar"/>
-	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120424005002/org.eclipse.virgo.util.common-3.5.0.D-20120424005002.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120424005002/org.eclipse.virgo.util.common-sources-3.5.0.D-20120424005002.jar"/>
-	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120424005002/org.eclipse.virgo.util.osgi-3.5.0.D-20120424005002.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120424005002/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120424005002.jar"/>
+	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-3.5.0.M04.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-sources-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M04/org.eclipse.virgo.util.common-3.5.0.M04.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M04/org.eclipse.virgo.util.common-sources-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-3.5.0.M04.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-sources-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-3.1.0.jar"/>
 	<classpathentry kind="var" path="REPOSITORY_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="REPOSITORY_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.codec/1.3.0/com.springsource.org.apache.commons.codec-1.3.0.jar"/>
 	<classpathentry kind="var" path="REPOSITORY_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="/REPOSITORY_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="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120424005002/org.eclipse.virgo.util.math-3.5.0.D-20120424005002.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120424005002/org.eclipse.virgo.util.math-sources-3.5.0.D-20120424005002.jar"/>
+	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.M04/org.eclipse.virgo.util.math-3.5.0.M04.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.M04/org.eclipse.virgo.util.math-sources-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar"/>
-	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120424005802/org.eclipse.virgo.medic-3.5.0.D-20120424005802.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120424005802/org.eclipse.virgo.medic-sources-3.5.0.D-20120424005802.jar"/>
+	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M04/org.eclipse.virgo.medic-3.5.0.M04.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M04/org.eclipse.virgo.medic-sources-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar"/>
-	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120424005802/org.eclipse.virgo.medic.test-3.5.0.D-20120424005802.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120424005802/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120424005802.jar"/>
+	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.M04/org.eclipse.virgo.medic.test-3.5.0.M04.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.M04/org.eclipse.virgo.medic.test-sources-3.5.0.M04.jar"/>
 	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.BUILD-20090909/com.springsource.org.aspectj.runtime-sources-1.6.6.BUILD-20090909.jar"/>
-	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120424004248/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120424004248.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120424004248/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120424004248.jar"/>
-	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120424005002/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120424005002.jar"/>
+	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.M04/org.eclipse.virgo.teststubs.osgi-3.5.0.M04.jar" sourcepath="/REPOSITORY_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/3.5.0.M04/org.eclipse.virgo.teststubs.osgi-3.5.0.M04.jar"/>
+	<classpathentry kind="var" path="REPOSITORY_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M04/org.eclipse.virgo.util.osgi.manifest-3.5.0.M04.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>