bug 423579: Update Apache Tomcat to version 7.0.53
diff --git a/build.versions b/build.versions
index a87f63b..67a35d6 100644
--- a/build.versions
+++ b/build.versions
@@ -10,7 +10,7 @@
org.eclipse.equinox.event=1.2.100.v20111010-1614
org.springframework=3.1.0.RELEASE
org.eclipse.gemini.blueprint=2.0.0.M02
-org.eclipse.gemini.web=2.2.2.RELEASE
+org.eclipse.gemini.web=2.2.3.RELEASE
org.aspectj=1.6.12.RELEASE
org.slf4j.nop=1.7.2.v201212060727
org.slf4j.api=1.7.2.v20121108-1250
@@ -27,7 +27,7 @@
org.glassfish.com.sun.faces=2.1.18.v201304210537-virgo-1
org.ow2.jotm.jotm-core=2.1.9.v201204271116
javax.ejb=3.1.1.v201204261316
-org.apache.tomcat.api=7.0.35.v201302120746
+org.apache.tomcat.api=7.0.53.v201406060720
javax.persistence=2.0.4.v201112161009
javax.annotation=1.1.0.v201108011116
org.apache.bval=0.5.0
@@ -54,15 +54,17 @@
javax.jms=1.1.0.v201205091237
javax.mail=1.4.0.v201005080615
javax.portlet=2.0.0.v20110525
-org.apache.catalina=7.0.35.v201302131125
-org.apache.catalina.ha=7.0.35.v201302131607
-org.apache.catalina.tribes=7.0.35.v201302140645
-org.apache.juli.extras=7.0.35.v201302120746
-org.apache.tomcat.util=7.0.35.v201302140645
-org.apache.tomcat.api=7.0.35.v201302120746
+org.apache.catalina=7.0.53.v201406061610
+org.apache.catalina.ha=7.0.53.v201406070630
+org.apache.catalina.tribes=7.0.53.v201406070630
+org.apache.juli.extras=7.0.53.v201406060720
+org.apache.tomcat.util=7.0.53.v201406070630
+org.apache.tomcat.api=7.0.53.v201406060720
+org.apache.tomcat.websocket=7.0.53.v201406070630
org.apache.taglibs=1.1.2.v20110517
javax.servlet.jsp=2.2.0.v201112011158
javax.servlet.jsp.jstl=1.2.0.v20110728
+javax.websocket=1.0.0.v201312030745
org.apache.commons.codec=1.3.0
org.apache.commons.logging=1.1.1
org.apache.commons.httpclient=3.1.0
@@ -78,7 +80,7 @@
org.eclipse.equinox.region=1.1.0.v20120319-1602
# Eclipse classpath references
-org.apache.coyote=7.0.35.v201302140645
-org.apache.el=7.0.35.v201302120746
-org.apache.jasper=7.0.35.v201302161127
+org.apache.coyote=7.0.53.v201406070630
+org.apache.el=7.0.53.v201406060720
+org.apache.jasper=7.0.53.v201406070630
diff --git a/org.eclipse.virgo.web.test/ivy.xml b/org.eclipse.virgo.web.test/ivy.xml
index 6271b2d..619937f 100644
--- a/org.eclipse.virgo.web.test/ivy.xml
+++ b/org.eclipse.virgo.web.test/ivy.xml
@@ -57,6 +57,7 @@
<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.region" rev="${org.eclipse.equinox.region}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.mirrored" name="javax.mail" rev="${javax.mail}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.mirrored" name="javax.ejb" rev="${javax.ejb}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.websocket" rev="${javax.websocket}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.logbackcorefragment" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.logbackclassicfragment" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
diff --git a/org.eclipse.virgo.web.tomcat.support/template.mf b/org.eclipse.virgo.web.tomcat.support/template.mf
index f0b5531..c28b6b0 100644
--- a/org.eclipse.virgo.web.tomcat.support/template.mf
+++ b/org.eclipse.virgo.web.tomcat.support/template.mf
@@ -26,6 +26,7 @@
org.apache.catalina.tribes.membership;version="${org.apache.catalina.tribes:[=.=.=, =.+1)}";resolution:=optional,
org.apache.catalina.tribes.transport.nio;version="${org.apache.catalina.tribes:[=.=.=, =.+1)}";resolution:=optional,
org.apache.catalina.tribes.transport;version="${org.apache.catalina.tribes:[=.=.=, =.+1)}";resolution:=optional,
- org.apache.catalina.tribes.group.interceptors;version="${org.apache.catalina.tribes:[=.=.=, =.+1)}";resolution:=optional
+ org.apache.catalina.tribes.group.interceptors;version="${org.apache.catalina.tribes:[=.=.=, =.+1)}";resolution:=optional,
+ javax.websocket;version="${javax.websocket:[=.=.=, =.+1)}";resolution:=optional
Excluded-Exports:
*
