bug 463160: Update Apache Tomcat to version 8.0.21. Adapt the changes in the APIs.

3 files changed, 15 insertions, 15 deletions

diff --git a/build-web-container/copyJavaxToOsgi.sh b/build-web-container/copyJavaxToOsgi.sh
index c93ba3d..2a83cbd 100755
--- a/build-web-container/copyJavaxToOsgi.sh
+++ b/build-web-container/copyJavaxToOsgi.sh
@@ -4,10 +4,10 @@ SRC=target/bundles
 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.jar $REPO/javax.el/javax.el-3.0.0.jar
+cp $SRC/javax.el-3.0.0.20150414.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.servlet-3.1.0.jar $REPO/javax.servlet/javax.servlet-3.1.0.jar
+cp $SRC/javax.servlet-3.1.0.20150414.jar $REPO/javax.servlet/javax.servlet-3.1.0.jar
 cp $SRC/javax.servlet.jsp-2.3.0.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
diff --git a/build-web-container/copyToOsgi.sh b/build-web-container/copyToOsgi.sh
index f5ae600..3b4127f 100755
--- a/build-web-container/copyToOsgi.sh
+++ b/build-web-container/copyToOsgi.sh
@@ -7,18 +7,18 @@ cp $SRC/org.eclipse.virgo.util.common-3.6.0.*.jar $REPO/org.eclipse.virgo.util.c
 cp $SRC/org.eclipse.virgo.util.io-3.6.0.*.jar $REPO/org.eclipse.virgo.util.io/org.eclipse.virgo.util.io-3.6.0.jar
 cp $SRC/org.eclipse.virgo.util.math-3.6.0.*.jar $REPO/org.eclipse.virgo.util.math/org.eclipse.virgo.util.math-3.6.0.jar
 cp $SRC/org.eclipse.virgo.util.parser.manifest-3.6.0.*.jar $REPO/org.eclipse.virgo.util.parser.manifest/org.eclipse.virgo.util.parser.manifest-3.6.0.jar
-cp $SRC/org.apache.catalina.ha-8.0.18.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-8.0.18.jar
-cp $SRC/org.apache.catalina-8.0.18.jar $REPO/org.apache.catalina/org.apache.catalina-8.0.18.jar
-cp $SRC/org.apache.catalina.tribes-8.0.18.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-8.0.18.jar
-cp $SRC/org.apache.coyote-8.0.18.jar $REPO/org.apache.coyote/org.apache.coyote-8.0.18.jar
-cp $SRC/org.apache.el-8.0.18.jar $REPO/org.apache.el/org.apache.el-8.0.18.jar
-cp $SRC/org.apache.jasper-8.0.18.jar $REPO/org.apache.jasper/org.apache.jasper-8.0.18.jar
-cp $SRC/org.apache.juli.extras-8.0.18.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-8.0.18.jar
-cp $SRC/org.apache.tomcat.api-8.0.18.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-8.0.18.jar
-cp $SRC/org.apache.tomcat.jni-8.0.18.jar $REPO/org.apache.tomcat.jni/org.apache.tomcat.jni-8.0.18.jar
-cp $SRC/org.apache.tomcat.util-8.0.18.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-8.0.18.jar
-cp $SRC/org.apache.tomcat.util.scan-8.0.18.jar $REPO/org.apache.tomcat.util.scan/org.apache.tomcat.util.scan-8.0.18.jar
-cp $SRC/org.apache.tomcat.websocket-8.0.18.jar $REPO/org.apache.tomcat.websocket/org.apache.tomcat.websocket-8.0.18.jar
+cp $SRC/org.apache.catalina.ha-8.0.21.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-8.0.21.jar
+cp $SRC/org.apache.catalina-8.0.21.jar $REPO/org.apache.catalina/org.apache.catalina-8.0.21.jar
+cp $SRC/org.apache.catalina.tribes-8.0.21.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-8.0.21.jar
+cp $SRC/org.apache.coyote-8.0.21.jar $REPO/org.apache.coyote/org.apache.coyote-8.0.21.jar
+cp $SRC/org.apache.el-8.0.21.jar $REPO/org.apache.el/org.apache.el-8.0.21.jar
+cp $SRC/org.apache.jasper-8.0.21.jar $REPO/org.apache.jasper/org.apache.jasper-8.0.21.jar
+cp $SRC/org.apache.juli.extras-8.0.21.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-8.0.21.jar
+cp $SRC/org.apache.tomcat.api-8.0.21.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-8.0.21.jar
+cp $SRC/org.apache.tomcat.jni-8.0.21.jar $REPO/org.apache.tomcat.jni/org.apache.tomcat.jni-8.0.21.jar
+cp $SRC/org.apache.tomcat.util-8.0.21.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-8.0.21.jar
+cp $SRC/org.apache.tomcat.util.scan-8.0.21.jar $REPO/org.apache.tomcat.util.scan/org.apache.tomcat.util.scan-8.0.21.jar
+cp $SRC/org.apache.tomcat.websocket-8.0.21.jar $REPO/org.apache.tomcat.websocket/org.apache.tomcat.websocket-8.0.21.jar
 cp $SRC/org.eclipse.gemini.web.core-2.2.1.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-2.2.1.jar
 cp $SRC/org.eclipse.gemini.web.extender-2.2.1.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-2.2.1.jar
 cp $SRC/org.eclipse.gemini.web.tomcat-2.2.1.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-2.2.1.jar
diff --git a/build-web-container/resources/About.html b/build-web-container/resources/About.html
index 5e517b1..393822f 100644
--- a/build-web-container/resources/About.html
+++ b/build-web-container/resources/About.html
@@ -45,7 +45,7 @@ and such source code may be obtained at <a href="http://www.eclipse.org/">http:/
 		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.0.18 - binary and source is available from the
+				Apache Tomcat 8.0.21 - binary and source is available from the
 				<a href="http://tomcat.apache.org/">Apache Tomcat project</a>
 			</li>
 		</ul>