diff --git a/build-web-container/copyJavaxToOsgi.sh b/build-web-container/copyJavaxToOsgi.sh
index 3b25e69..4a435ef 100755
--- a/build-web-container/copyJavaxToOsgi.sh
+++ b/build-web-container/copyJavaxToOsgi.sh
@@ -4,13 +4,13 @@
 cp $SRC/com.springsource.javax.activation-1.1.0.jar $REPO/com.springsource.javax.activation/com.springsource.javax.activation-1.1.0.jar
 cp $SRC/javax.annotation-1.2.0.v201401042248.jar $REPO/javax.annotation/javax.annotation-1.2.0.v201401042248.jar
 cp $SRC/javax.ejb-3.1.1.v201204261316.jar $REPO/javax.ejb/javax.ejb-3.1.1.v201204261316.jar
-cp $SRC/javax.el-3.0.0.20180730.jar $REPO/javax.el/javax.el-3.0.0.jar
+cp $SRC/javax.el-3.0.0.20200621.jar $REPO/javax.el/javax.el-3.0.0.jar
 cp $SRC/javax.mail-1.4.0.v201005080615.jar $REPO/javax.mail/javax.mail-1.4.0.v201005080615.jar
 cp $SRC/javax.persistence-2.1.0.v201304241213.jar $REPO/javax.persistence/javax.persistence-2.1.0.v201304241213.jar
-cp $SRC/javax.security.auth.message-1.1.0.20180730.jar $REPO/javax.security.auth.message/javax.security.auth.message-1.1.0.jar
-cp $SRC/javax.servlet-3.1.0.20180730.jar $REPO/javax.servlet/javax.servlet-3.1.0.jar
-cp $SRC/javax.servlet.jsp-2.3.0.20180730.jar $REPO/javax.servlet.jsp/javax.servlet.jsp-2.3.0.jar
+cp $SRC/javax.security.auth.message-1.1.0.20200621.jar $REPO/javax.security.auth.message/javax.security.auth.message-1.1.0.jar
+cp $SRC/javax.servlet-3.1.0.20200621.jar $REPO/javax.servlet/javax.servlet-3.1.0.jar
+cp $SRC/javax.servlet.jsp-2.3.0.20200621.jar $REPO/javax.servlet.jsp/javax.servlet.jsp-2.3.0.jar
 cp $SRC/javax.transaction-1.1.0.v201205091237.jar $REPO/javax.transaction/javax.transaction-1.1.0.v201205091237.jar
 cp $SRC/javax.xml.rpc-1.1.0.v201005080400.jar $REPO/javax.xml.rpc/javax.xml.rpc-1.1.0.v201005080400.jar
 cp $SRC/javax.xml.soap-1.3.0.v201105210645.jar $REPO/javax.xml.soap/javax.xml.soap-1.3.0.v201105210645.jar
-cp $SRC/javax.websocket_1.1.0.20180730.jar $REPO/javax.websocket/javax.websocket_1.1.0.jar
+cp $SRC/javax.websocket_1.1.0.20200621.jar $REPO/javax.websocket/javax.websocket_1.1.0.jar
diff --git a/build-web-container/copyToOsgi.sh b/build-web-container/copyToOsgi.sh
index 678e591..f73b27b 100755
--- a/build-web-container/copyToOsgi.sh
+++ b/build-web-container/copyToOsgi.sh
@@ -7,18 +7,18 @@
 cp $SRC/org.eclipse.virgo.util.io-3.6.3.*.jar $REPO/org.eclipse.virgo.util.io/org.eclipse.virgo.util.io-3.6.3.jar
 cp $SRC/org.eclipse.virgo.util.math-3.6.3.*.jar $REPO/org.eclipse.virgo.util.math/org.eclipse.virgo.util.math-3.6.3.jar
 cp $SRC/org.eclipse.virgo.util.parser.manifest-3.6.3.*.jar $REPO/org.eclipse.virgo.util.parser.manifest/org.eclipse.virgo.util.parser.manifest-3.6.3.jar
-cp $SRC/org.apache.catalina.ha-8.5.53.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-8.5.53.jar
-cp $SRC/org.apache.catalina-8.5.53.jar $REPO/org.apache.catalina/org.apache.catalina-8.5.53.jar
-cp $SRC/org.apache.catalina.tribes-8.5.53.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-8.5.53.jar
-cp $SRC/org.apache.coyote-8.5.53.jar $REPO/org.apache.coyote/org.apache.coyote-8.5.53.jar
-cp $SRC/org.apache.el-8.5.53.jar $REPO/org.apache.el/org.apache.el-8.5.53.jar
-cp $SRC/org.apache.jasper-8.5.53.jar $REPO/org.apache.jasper/org.apache.jasper-8.5.53.jar
-cp $SRC/org.apache.juli.extras-8.5.53.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-8.5.53.jar
-cp $SRC/org.apache.tomcat.api-8.5.53.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-8.5.53.jar
-cp $SRC/org.apache.tomcat.jni-8.5.53.jar $REPO/org.apache.tomcat.jni/org.apache.tomcat.jni-8.5.53.jar
-cp $SRC/org.apache.tomcat.util-8.5.53.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-8.5.53.jar
-cp $SRC/org.apache.tomcat.util.scan-8.5.53.jar $REPO/org.apache.tomcat.util.scan/org.apache.tomcat.util.scan-8.5.53.jar
-cp $SRC/org.apache.tomcat.websocket-8.5.53.jar $REPO/org.apache.tomcat.websocket/org.apache.tomcat.websocket-8.5.53.jar
+cp $SRC/org.apache.catalina.ha-8.5.56.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-8.5.56.jar
+cp $SRC/org.apache.catalina-8.5.56.jar $REPO/org.apache.catalina/org.apache.catalina-8.5.56.jar
+cp $SRC/org.apache.catalina.tribes-8.5.56.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-8.5.56.jar
+cp $SRC/org.apache.coyote-8.5.56.jar $REPO/org.apache.coyote/org.apache.coyote-8.5.56.jar
+cp $SRC/org.apache.el-8.5.56.jar $REPO/org.apache.el/org.apache.el-8.5.56.jar
+cp $SRC/org.apache.jasper-8.5.56.jar $REPO/org.apache.jasper/org.apache.jasper-8.5.56.jar
+cp $SRC/org.apache.juli.extras-8.5.56.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-8.5.56.jar
+cp $SRC/org.apache.tomcat.api-8.5.56.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-8.5.56.jar
+cp $SRC/org.apache.tomcat.jni-8.5.56.jar $REPO/org.apache.tomcat.jni/org.apache.tomcat.jni-8.5.56.jar
+cp $SRC/org.apache.tomcat.util-8.5.56.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-8.5.56.jar
+cp $SRC/org.apache.tomcat.util.scan-8.5.56.jar $REPO/org.apache.tomcat.util.scan/org.apache.tomcat.util.scan-8.5.56.jar
+cp $SRC/org.apache.tomcat.websocket-8.5.56.jar $REPO/org.apache.tomcat.websocket/org.apache.tomcat.websocket-8.5.56.jar
 cp $SRC/org.eclipse.gemini.web.core-3.0.0.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-3.0.0.jar
 cp $SRC/org.eclipse.gemini.web.extender-3.0.0.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-3.0.0.jar
 cp $SRC/org.eclipse.gemini.web.tomcat-3.0.0.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-3.0.0.jar
diff --git a/build-web-container/resources/About.html b/build-web-container/resources/About.html
index 5310c48..f331dcd 100644
--- a/build-web-container/resources/About.html
+++ b/build-web-container/resources/About.html
@@ -45,7 +45,7 @@
 		This product contains software developed by the Apache Software Foundation (<a href="http://www.apache.org">http://www.apache.org</a>).
 		<ul>
 			<li>
-				Apache Tomcat 8.5.53 - binary and source is available from the
+				Apache Tomcat 8.5.56 - binary and source is available from the
 				<a href="http://tomcat.apache.org/">Apache Tomcat project</a>
 			</li>
 		</ul>
diff --git a/build.versions b/build.versions
index 9ce0117..973ef35 100644
--- a/build.versions
+++ b/build.versions
@@ -46,14 +46,14 @@
 #CQ4111
 org.apache.taglibs=1.1.2.v20110518
 
-#CQ21807
-org.apache.catalina=8.5.53
-#CQ16946
-javax.el=3.0.0.20180730
-javax.security.auth.message=1.1.0.20180730
-javax.servlet=3.1.0.20180730
-javax.servlet.jsp=2.3.0.20180730
-javax.websocket=1.1.0.20180730
+#CQ22255
+org.apache.catalina=8.5.56
+#CQ22255
+javax.el=3.0.0.20200621
+javax.security.auth.message=1.1.0.20200621
+javax.servlet=3.1.0.20200621
+javax.servlet.jsp=2.3.0.20200621
+javax.websocket=1.1.0.20200621
 
 #CQ6925
 org.slf4j.api=1.7.2.v20121108-1250
diff --git a/org.eclipse.gemini.web.core/.classpath b/org.eclipse.gemini.web.core/.classpath
index 9f37f90..3c1df32 100644
--- a/org.eclipse.gemini.web.core/.classpath
+++ b/org.eclipse.gemini.web.core/.classpath
@@ -22,13 +22,13 @@
 	</classpathentry>
 	<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.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-3.1.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-sources-3.1.0.20180730.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.56/org.apache.catalina-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.56/org.apache.catalina.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.56/org.apache.juli-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.56/org.apache.juli.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.56/org.apache.jasper-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.56/org.apache.jasper.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.56/org.apache.catalina.ha-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.56/org.apache.catalina.ha.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.56/org.apache.catalina.tribes-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.56/org.apache.catalina.tribes.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.56/org.apache.coyote-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.56/org.apache.coyote.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-3.1.0.20200621.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-sources-3.1.0.20200621.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.virgo.mirrored/org.eclipse.equinox.event/1.3.100.v20140115-1647/org.eclipse.equinox.event-1.3.100.v20140115-1647.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.3.100.v20140115-1647/org.eclipse.equinox.event-sources-1.3.100.v20140115-1647.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" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.nop/1.7.2.v201212060727/org.slf4j.nop-sources-1.7.2.v201212060727.jar"/>
diff --git a/org.eclipse.gemini.web.extender/.classpath b/org.eclipse.gemini.web.extender/.classpath
index fce3024..a36e596 100644
--- a/org.eclipse.gemini.web.extender/.classpath
+++ b/org.eclipse.gemini.web.extender/.classpath
@@ -23,7 +23,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.core"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi.source-3.10.0.v20140606-1445.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-3.1.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-sources-3.1.0.20180730.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-3.1.0.20200621.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-sources-3.1.0.20200621.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-3.7.0.BUILD-20150104200311.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-sources-3.7.0.BUILD-20150104200311.jar"/>
 	<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.5.0/com.springsource.org.junit-sources-4.5.0.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"/>
diff --git a/org.eclipse.gemini.web.test/.classpath b/org.eclipse.gemini.web.test/.classpath
index 9ef3d78..43b2ef6 100644
--- a/org.eclipse.gemini.web.test/.classpath
+++ b/org.eclipse.gemini.web.test/.classpath
@@ -13,14 +13,14 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.7.0.D-20140919122012/org.eclipse.virgo.util.parser.launcher-3.7.0.D-20140919122012.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.launcher-3.7.0.BUILD-20150104200311.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" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-3.1.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-sources-3.1.0.20180730.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.websocket/1.1.0.20180730/javax.websocket-1.1.0.20180730.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.56/org.apache.catalina-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.56/org.apache.catalina.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.56/org.apache.juli-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.56/org.apache.juli.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.56/org.apache.jasper-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.56/org.apache.jasper.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.56/org.apache.catalina.ha-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.56/org.apache.catalina.ha.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.56/org.apache.catalina.tribes-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.56/org.apache.catalina.tribes.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.56/org.apache.coyote-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.56/org.apache.coyote.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-3.1.0.20200621.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-sources-3.1.0.20200621.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.websocket/1.1.0.20200621/javax.websocket-1.1.0.20200621.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 combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.tomcat"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.framework-3.7.0.BUILD-20150104200311.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.framework-sources-3.7.0.BUILD-20150104200311.jar"/>
diff --git a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
index 989e615..f3bc64b 100644
--- a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
+++ b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
@@ -575,7 +575,7 @@
 
         Object[] result = startWebApplicationWith(LOCATION_WAR_WITH_TLD, "/war-with-tld");
         try {
-            validateURLExpectedContent("http://localhost:8080/war-with-tld", new String[] { "test.jsp", "0.3 kb" });
+            validateURLExpectedContent("http://localhost:8080/war-with-tld", new String[] { "test.jsp", "0.2 kb" });
         } finally {
             this.container.stopWebApplication((WebApplicationHandle) result[1]);
             ((Bundle) result[0]).uninstall();
diff --git a/org.eclipse.gemini.web.tomcat/.classpath b/org.eclipse.gemini.web.tomcat/.classpath
index 54e6896..23cc662 100644
--- a/org.eclipse.gemini.web.tomcat/.classpath
+++ b/org.eclipse.gemini.web.tomcat/.classpath
@@ -26,20 +26,20 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.3.RELEASE/org.eclipse.virgo.util.osgi-3.6.3.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.6.3.RELEASE/org.eclipse.virgo.util.osgi-sources-3.6.3.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.3.RELEASE/org.eclipse.virgo.util.common-3.6.3.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.6.3.RELEASE/org.eclipse.virgo.util.common-sources-3.6.3.RELEASE.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" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.53/org.apache.tomcat.api-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.53/org.apache.tomcat.api.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/8.5.53/org.apache.tomcat.util-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/8.5.53/org.apache.tomcat.util.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.53/org.apache.tomcat.util.scan-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.53/org.apache.tomcat.util.scan.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.websocket/8.5.53/org.apache.tomcat.websocket-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.websocket/8.5.53/org.apache.tomcat.websocket.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-3.1.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-sources-3.1.0.20180730.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.56/org.apache.catalina-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.56/org.apache.catalina.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.56/org.apache.juli-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.56/org.apache.juli.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.56/org.apache.jasper-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.56/org.apache.jasper.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.56/org.apache.catalina.ha-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.56/org.apache.catalina.ha.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.56/org.apache.catalina.tribes-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.56/org.apache.catalina.tribes.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.56/org.apache.coyote-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.56/org.apache.coyote.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.56/org.apache.tomcat.api-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.56/org.apache.tomcat.api.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/8.5.56/org.apache.tomcat.util-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/8.5.56/org.apache.tomcat.util.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.56/org.apache.tomcat.util.scan-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.56/org.apache.tomcat.util.scan.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.websocket/8.5.56/org.apache.tomcat.websocket-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.websocket/8.5.56/org.apache.tomcat.websocket.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-3.1.0.20200621.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-sources-3.1.0.20200621.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 combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.core"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.el/3.0.0.20180730/javax.el-3.0.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.el/3.0.0.20180730/javax.el.source-3.0.0.20180730.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.el/3.0.0.20200621/javax.el-3.0.0.20200621.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.el/3.0.0.20200621/javax.el.source-3.0.0.20200621.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-3.7.0.BUILD-20150104200311.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-sources-3.7.0.BUILD-20150104200311.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/test-bundles/customizer-bundle/.classpath b/test-bundles/customizer-bundle/.classpath
index f78670f..28d4138 100755
--- a/test-bundles/customizer-bundle/.classpath
+++ b/test-bundles/customizer-bundle/.classpath
@@ -3,9 +3,9 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.tomcat"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.53/org.apache.tomcat.api-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.53/org.apache.tomcat.api.source-8.5.53.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.53/org.apache.tomcat.util.scan-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.53/org.apache.tomcat.util.scan.source-8.5.53.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.56/org.apache.tomcat.api-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.56/org.apache.tomcat.api.source-8.5.56.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.56/org.apache.tomcat.util.scan-8.5.56.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.56/org.apache.tomcat.util.scan.source-8.5.56.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi.source-3.10.0.v20140606-1445.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-3.1.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-sources-3.1.0.20180730.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-3.1.0.20200621.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20200621/javax.servlet-sources-3.1.0.20200621.jar"/>
 	<classpathentry kind="output" path="target"/>
 </classpath>