Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server
diff --git a/build-tomcat-server/build.xml b/build-tomcat-server/build.xml
index 201aea9..fc62c5b 100644
--- a/build-tomcat-server/build.xml
+++ b/build-tomcat-server/build.xml
@@ -128,8 +128,8 @@
<fileset dir="${basedir}/configuration"/>
</copy>
- <replaceregexp match="initialArtifacts =.*\.springdm"
- replace="initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.springdm, repository:plan/org.eclipse.virgo.web.tomcat" flags="s"
+ <replaceregexp match="initialArtifacts =.*\.blueprint"
+ replace="initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.blueprint, repository:plan/org.eclipse.virgo.web.tomcat" flags="s"
file="${tomcat.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>
<replaceregexp match="virgo-kernel" replace="virgo-server" flags="g"
diff --git a/build.versions b/build.versions
index a597e4f..9f7fc27 100644
--- a/build.versions
+++ b/build.versions
@@ -1,10 +1,10 @@
-org.eclipse.virgo.medic=3.6.0.D-20120717201225
-org.eclipse.virgo.kernel=3.6.0.D-20120727123513
-org.eclipse.virgo.repository=3.6.0.D-20120717202028
-org.eclipse.virgo.documentation=3.6.0.D-20120727143446
-org.eclipse.virgo.apps=3.6.0.D-20120727141530
-org.eclipse.virgo.web=3.6.0.D-20120727132746
-org.eclipse.virgo.util=3.6.0.D-20120717181632
+org.eclipse.virgo.medic=3.6.0.D-20120813141556
+org.eclipse.virgo.kernel=3.6.0.D-20120814134010
+org.eclipse.virgo.repository=3.6.0.D-20120813144240
+org.eclipse.virgo.documentation=3.6.0.D-20120815125455
+org.eclipse.virgo.apps=3.6.0.D-20120815123956
+org.eclipse.virgo.web=3.6.0.D-20120815112027
+org.eclipse.virgo.util=3.6.0.D-20120813140754
javax.ejb=3.0.0.v201203061215
javax.jms=1.1.0.v201205091237
javax.portlet=2.0.0.v20110525
