Merge remote branch 'origin/master' into 364571-introduce-nano
diff --git a/build.versions b/build.versions
index 173130d..43bdd2c 100644
--- a/build.versions
+++ b/build.versions
@@ -1,13 +1,13 @@
# Compile
-org.eclipse.virgo.kernel=3.1.0.D-20111223114541
-org.eclipse.virgo.osgi=3.1.0.D-20111205151528
-org.eclipse.virgo.medic=3.1.0.D-20111223113430
-org.eclipse.virgo.repository=3.1.0.D-20111223114028
-org.eclipse.virgo.util=3.1.0.D-20111205151812
+org.eclipse.virgo.kernel=3.1.0.D-20120105235247
+org.eclipse.virgo.osgi=3.1.0.M01
+org.eclipse.virgo.medic=3.1.0.M01
+org.eclipse.virgo.repository=3.1.0.M01
+org.eclipse.virgo.util=3.1.0.M01
# Test
-org.eclipse.virgo.test=3.1.0.D-20111205152315
+org.eclipse.virgo.test=3.1.0.M01
org.aspectj=1.6.6.RELEASE
org.eclipse.osgi=3.7.1.R37x_v20110808-1106
org.eclipse.osgi.services=3.3.0.v20110513
diff --git a/org.eclipse.virgo.kernel.tools/.classpath b/org.eclipse.virgo.kernel.tools/.classpath
index 5f9a281..a42d38d 100644
--- a/org.eclipse.virgo.kernel.tools/.classpath
+++ b/org.eclipse.virgo.kernel.tools/.classpath
@@ -22,16 +22,16 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.1.0.D-20111223114028/org.eclipse.virgo.repository-3.1.0.D-20111223114028.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.1.0.D-20111223114028/org.eclipse.virgo.repository-sources-3.1.0.D-20111223114028.jar"/>
- <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.1.0.D-20111205151812/org.eclipse.virgo.util.osgi.manifest-3.1.0.D-20111205151812.jar"/>
- <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.1.0.D-20111205151812/org.eclipse.virgo.util.parser.manifest-3.1.0.D-20111205151812.jar"/>
- <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.1.0.D-20111223114541/org.eclipse.virgo.kernel.artifact-3.1.0.D-20111223114541.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.1.0.D-20111223114541/org.eclipse.virgo.kernel.artifact-sources-3.1.0.D-20111223114541.jar"/>
- <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111223113430/org.eclipse.virgo.medic-3.1.0.D-20111223113430.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.D-20111223113430/org.eclipse.virgo.medic-sources-3.1.0.D-20111223113430.jar"/>
- <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.1.0.D-20111205152315/org.eclipse.virgo.test.framework-3.1.0.D-20111205152315.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.1.0.D-20111205152315/org.eclipse.virgo.test.framework-sources-3.1.0.D-20111205152315.jar"/>
- <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.1.0.D-20111205151528/org.eclipse.virgo.osgi.launcher-3.1.0.D-20111205151528.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.1.0.D-20111205151528/org.eclipse.virgo.osgi.launcher-sources-3.1.0.D-20111205151528.jar"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.1.0.M01/org.eclipse.virgo.repository-3.1.0.M01.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.1.0.M01/org.eclipse.virgo.repository-sources-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.1.0.M01/org.eclipse.virgo.util.osgi.manifest-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.1.0.M01/org.eclipse.virgo.util.parser.manifest-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.1.0.D-20120105235247/org.eclipse.virgo.kernel.artifact-3.1.0.D-20120105235247.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.1.0.D-20120105235247/org.eclipse.virgo.kernel.artifact-sources-3.1.0.D-20120105235247.jar"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.M01/org.eclipse.virgo.medic-3.1.0.M01.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.1.0.M01/org.eclipse.virgo.medic-sources-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.1.0.M01/org.eclipse.virgo.test.framework-3.1.0.M01.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.1.0.M01/org.eclipse.virgo.test.framework-sources-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.1.0.M01/org.eclipse.virgo.osgi.launcher-3.1.0.M01.jar" sourcepath="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.1.0.M01/org.eclipse.virgo.osgi.launcher-sources-3.1.0.M01.jar"/>
<classpathentry kind="var" path="KERNEL_TOOLS_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="/KERNEL_TOOLS_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="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20111205151812/org.eclipse.virgo.util.common-3.1.0.D-20111205151812.jar" sourcepath="/KERNEL_TOOLS_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="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/ivydata-3.1.0.D-20111205151812.properties"/>
- <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.1.0.D-20111205151812/org.eclipse.virgo.util.math-3.1.0.D-20111205151812.jar"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_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="/KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.M01/org.eclipse.virgo.util.common-sources-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/ivydata-3.1.0.M01.properties"/>
+ <classpathentry kind="var" path="KERNEL_TOOLS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.1.0.M01/org.eclipse.virgo.util.math-3.1.0.M01.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
