diff --git a/build.versions b/build.versions
index 2923ac5..598b3dc 100644
--- a/build.versions
+++ b/build.versions
@@ -1,10 +1,10 @@
 # Compile
-org.eclipse.virgo.kernel=3.7.0.D-20130426092903
-org.eclipse.virgo.nano=3.7.0.D-20130426092018
-org.eclipse.virgo.medic=3.7.0.D-20130426091716
-org.eclipse.virgo.repository=3.7.0.D-20130426092504
-org.eclipse.virgo.util=3.7.0.D-20130426090800
-org.eclipse.virgo.web=3.7.0.D-20130515062000
+org.eclipse.virgo.kernel=3.7.0.D-20130521042331
+org.eclipse.virgo.nano=3.7.0.D-20130521041633
+org.eclipse.virgo.medic=3.7.0.D-20130521041335
+org.eclipse.virgo.repository=3.7.0.D-20130521042107
+org.eclipse.virgo.util=3.7.0.D-20130521040431
+org.eclipse.virgo.web=3.7.0.D-20130521045731
 org.eclipse.gemini.web=2.2.2.RELEASE
 javax.jms=1.1.0.v201205091237
 javax.servlet.jsp.jstl=1.2.0.v20110728
@@ -28,7 +28,7 @@
 org.eclipse.gemini.management=1.0.5.RELEASE
 
 # Test
-org.eclipse.virgo.test=3.7.0.D-20130426091442
+org.eclipse.virgo.test=3.7.0.D-20130521041102
 org.junit=4.7.0
 org.easymock=2.3.0
 
diff --git a/org.eclipse.virgo.apps.repository.core/.classpath b/org.eclipse.virgo.apps.repository.core/.classpath
index 8994b67..408038c 100644
--- a/org.eclipse.virgo.apps.repository.core/.classpath
+++ b/org.eclipse.virgo.apps.repository.core/.classpath
@@ -23,20 +23,20 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.7.0.D-20130426092504/org.eclipse.virgo.repository-3.7.0.D-20130426092504.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.D-20130426090800/org.eclipse.virgo.util.osgi.manifest-3.7.0.D-20130426090800.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.7.0.D-20130521042107/org.eclipse.virgo.repository-3.7.0.D-20130521042107.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.D-20130521040431/org.eclipse.virgo.util.osgi.manifest-3.7.0.D-20130521040431.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-sources-3.1.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130426090800/org.eclipse.virgo.util.io-3.7.0.D-20130426090800.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100218173020/org.eclipse.virgo.util.io-sources-2.1.0.D-20100218173020.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/3.7.0.D-20130426092903/org.eclipse.virgo.kernel.services-3.7.0.D-20130426092903.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.services-sources-2.1.0.D-20100218174319.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130521040431/org.eclipse.virgo.util.io-3.7.0.D-20130521040431.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100218173020/org.eclipse.virgo.util.io-sources-2.1.0.D-20100218173020.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/3.7.0.D-20130521042331/org.eclipse.virgo.kernel.services-3.7.0.D-20130521042331.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.services-sources-2.1.0.D-20100218174319.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.nop/1.7.2.v201212060727/org.slf4j.nop-1.7.2.v201212060727.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.7.0.D-20130426090800/org.eclipse.virgo.util.math-3.7.0.D-20130426090800.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.7.0.D-20130521040431/org.eclipse.virgo.util.math-3.7.0.D-20130521040431.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.2.2.RELEASE/org.eclipse.gemini.web.core-2.2.2.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.7.0.D-20130426091716/org.eclipse.virgo.medic.test-3.7.0.D-20130426091716.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.1.CI-59/org.eclipse.virgo.medic.test-sources-1.0.1.CI-59.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.7.0.D-20130521041335/org.eclipse.virgo.medic.test-3.7.0.D-20130521041335.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.1.CI-59/org.eclipse.virgo.medic.test-sources-1.0.1.CI-59.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.7.0.D-20130426091716/org.eclipse.virgo.medic-3.7.0.D-20130426091716.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.1.CI-59/org.eclipse.virgo.medic-sources-1.0.1.CI-59.jar">
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.7.0.D-20130521041335/org.eclipse.virgo.medic-3.7.0.D-20130521041335.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.1.CI-59/org.eclipse.virgo.medic-sources-1.0.1.CI-59.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
diff --git a/org.eclipse.virgo.apps.repository.test/.classpath b/org.eclipse.virgo.apps.repository.test/.classpath
index 82923a3..da375e9 100644
--- a/org.eclipse.virgo.apps.repository.test/.classpath
+++ b/org.eclipse.virgo.apps.repository.test/.classpath
@@ -7,17 +7,17 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/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="IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-sources-3.1.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130426092018/org.eclipse.virgo.nano.deployer.api-3.7.0.D-20130426092018.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.7.0.D-20130521041633/org.eclipse.virgo.nano.deployer.api-3.7.0.D-20130521041633.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20120711092707/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20120711092707.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.D-20130426090800/org.eclipse.virgo.util.osgi.manifest-3.7.0.D-20130426090800.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.7.0.D-20130426092504/org.eclipse.virgo.repository-3.7.0.D-20130426092504.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130426090800/org.eclipse.virgo.util.io-3.7.0.D-20130426090800.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.0.0.M5/org.eclipse.virgo.util.io-sources-2.0.0.M5.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.D-20130521040431/org.eclipse.virgo.util.osgi.manifest-3.7.0.D-20130521040431.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.7.0.D-20130521042107/org.eclipse.virgo.repository-3.7.0.D-20130521042107.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.D-20130521040431/org.eclipse.virgo.util.io-3.7.0.D-20130521040431.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.0.0.M5/org.eclipse.virgo.util.io-sources-2.0.0.M5.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-sources-3.1.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130426092903/org.eclipse.virgo.kernel.deployer-3.7.0.D-20130426092903.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100218174319.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130426092903/org.eclipse.virgo.kernel.osgi-3.7.0.D-20130426092903.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100218174319.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.D-20130426090800/org.eclipse.virgo.util.common-3.7.0.D-20130426090800.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.D-20130426090800/org.eclipse.virgo.util.common-sources-3.7.0.D-20130426090800.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.7.0.D-20130521042331/org.eclipse.virgo.kernel.deployer-3.7.0.D-20130521042331.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100218174319.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.7.0.D-20130521042331/org.eclipse.virgo.kernel.osgi-3.7.0.D-20130521042331.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100218174319.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.D-20130521040431/org.eclipse.virgo.util.common-3.7.0.D-20130521040431.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.D-20130521040431/org.eclipse.virgo.util.common-sources-3.7.0.D-20130521040431.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.D-20130426091442/org.eclipse.virgo.test.framework-3.7.0.D-20130426091442.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.D-20130426091442/org.eclipse.virgo.test.framework-sources-3.7.0.D-20130426091442.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.D-20130521041102/org.eclipse.virgo.test.framework-3.7.0.D-20130521041102.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.D-20130521041102/org.eclipse.virgo.test.framework-sources-3.7.0.D-20130521041102.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.test.launcher-3.6.0.D-20120711092707.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/2.0.0.CI-B50/org.eclipse.virgo.test.launcher-sources-2.0.0.CI-B50.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.apps.repository.core"/>
 	<classpathentry kind="output" path="target/classes"/>