diff --git a/LICENSE.txt b/LICENSE.txt index 766691a55e7fe8c49c3ade68171d02cd66f8b5dd..d177d7983ccac15d23a3d94a0d4a919a64c2667f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -283,7 +283,7 @@ Applications: Bundles systray4j-2.4.1: See licenses/LICENSE-LGPLv2.1.txt - Tomcat 6.0.47: + Tomcat 6.0.48: Copyright 1999-2016 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt See licenses/NOTICE-Tomcat.txt diff --git a/apps/jetty/apache-tomcat-deployer/README-i2p.txt b/apps/jetty/apache-tomcat-deployer/README-i2p.txt index c354fb71af810a69c72b2b26a837384326d59123..6b8c0edf3159935d2009190e588c58b9db99d51c 100644 --- a/apps/jetty/apache-tomcat-deployer/README-i2p.txt +++ b/apps/jetty/apache-tomcat-deployer/README-i2p.txt @@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1. The Glassfish JSP 2.1 bundled in Jetty 6 is way too old. Retrieved from the file - apache-tomcat-6.0.44-deployer.tar.gz + apache-tomcat-6.0.48-deployer.tar.gz minus the following files and directores: diff --git a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar index 4b5aa36d302381d8b05d04d91ed45141030ab908..2598a4a8fa66bcaec88ccede7710159f6d9fead8 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar index 51ec6f3080e949072f84ae6fbeb3383d846ca02a..b7205e347de032147194f587b4a5adaaae554fbe 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar index 7242ce7d1bd874900ca2ed17ff3ce825acb69a46..ca2d7269d81e81c090fbb58fd48c239a017b7466 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar index 37d316ecacc7d4746890c6a17f8c933de73adf7c..c5e0f8f7791109d3a488042772351e1a47f16c21 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar and b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar differ diff --git a/apps/jetty/apache-tomcat/README-i2p.txt b/apps/jetty/apache-tomcat/README-i2p.txt index f62c55e862898c2b60e0b83f2ef10ba23b9d8d8a..015ff4736a7757a2868b3ef29c58a02e4a4815e9 100644 --- a/apps/jetty/apache-tomcat/README-i2p.txt +++ b/apps/jetty/apache-tomcat/README-i2p.txt @@ -1,7 +1,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1. Retrieved from the file - apache-tomcat-6.0.44.tar.gz + apache-tomcat-6.0.48.tar.gz containing only a small subset of lib/tomcat-coyote.jar. diff --git a/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar b/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar index 9403f2ece5024641e010d97365c52eeb0b6ad1cb..a45499414ec8c2d28372de113225872cb40113f9 100644 Binary files a/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar and b/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar differ diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index 7e19fa1dbeafa1d501dadabc62bea973df48c83a..1f5c8102844fcfd148e5e531767c949477358f5d 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -22,7 +22,7 @@ <property name="javac.compilerargs" value="" /> <property name="javac.version" value="1.7" /> <property name="tomcat.lib" value="apache-tomcat-deployer/lib" /> - <property name="tomcat.ver" value="6.0.47" /> + <property name="tomcat.ver" value="6.0.48" /> <property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" /> <property name="tomcat2.lib.small" value="apache-tomcat/lib" />