Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server
diff --git a/build-tomcat-server/resources/About.html b/build-tomcat-server/resources/About.html
index fd341ba..46fbf25 100644
--- a/build-tomcat-server/resources/About.html
+++ b/build-tomcat-server/resources/About.html
@@ -6,7 +6,7 @@
</HEAD><BODY lang="EN-US">
<H2>About This Content</H2>
-<P>25 May 2010</P>
+<P>2 August 2011</P>
<H3>License</H3>
<P>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
@@ -43,10 +43,6 @@
<li>
Apache Commons IO 1.4.0 - binary and source is available from the <a href="http://commons.apache.org/io/">Apache Commons IO project</a>
</li>
- <li>
- Apache Felix Log Service 1.0.0 - binary and source is available from the Apache Felix
- <a href="http://felix.apache.org/site/apache-felix-log.html">Log Service subproject</a>
- </li>
<li>
Apache Standard Taglibs 1.1.2.v20110517 - binary and source is available from the
<a href="http://tomcat.apache.org/taglibs/index.html">Apache Taglibs project</a>
diff --git a/build.versions b/build.versions
index 47f5386..c52059a 100644
--- a/build.versions
+++ b/build.versions
@@ -1,11 +1,11 @@
-org.eclipse.virgo.osgi=3.0.0.RC1
-org.eclipse.virgo.medic=3.0.0.RC1
-org.eclipse.virgo.kernel=3.0.0.RC1
-org.eclipse.virgo.repository=3.0.0.RC1
-org.eclipse.virgo.documentation=3.0.0.D-20110728120650
-org.eclipse.virgo.apps=3.0.0.D-20110728115315
-org.eclipse.virgo.web=3.0.0.D-20110728111528
-org.eclipse.virgo.util=3.0.0.RC1
+org.eclipse.virgo.osgi=3.0.0.D-20110801094018
+org.eclipse.virgo.medic=3.0.0.D-20110801094811
+org.eclipse.virgo.kernel=3.0.0.D-20110801095533
+org.eclipse.virgo.repository=3.0.0.D-20110801095215
+org.eclipse.virgo.documentation=3.0.0.D-20110801110622
+org.eclipse.virgo.apps=3.0.0.D-20110801105358
+org.eclipse.virgo.web=3.0.0.D-20110801102157
+org.eclipse.virgo.util=3.0.0.D-20110801094248
javax.ejb=3.0.0
javax.jms=1.1.0
javax.portlet=2.0.0.v20110525
@@ -21,7 +21,7 @@
org.apache.commons.io=1.4.0
org.apache.taglibs.standard=1.1.2.v20110517
org.aspectj=1.6.6.RELEASE
-org.eclipse.osgi=3.7.0.v20110224
+org.eclipse.osgi=3.7.0.v20110613
org.eclipse.osgi.services=3.3.0.v20110110
org.eclipse.equinox.event=1.2.100.v20110110
org.junit=4.7.0
