This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit cfba209f57f8e5583d444b5583c4f553e9f3ba14 Merge: ba53720 9e8f2cb Author: Emmanuel Bourg <[email protected]> Date: Tue Jan 27 22:45:16 2015 +0100 Merge tag 'upstream/8.0.18' Upstream version 8.0.18 build.properties.default | 2 +- conf/catalina.properties | 12 ++ java/org/apache/catalina/WebResourceSet.java | 23 +- java/org/apache/catalina/connector/Response.java | 4 +- java/org/apache/catalina/core/StandardContext.java | 37 +++- .../apache/catalina/core/StandardHostValve.java | 8 +- java/org/apache/catalina/filters/CorsFilter.java | 6 + .../ha/authenticator/mbeans-descriptors.xml | 20 +- .../catalina/ha/context/ReplicatedContext.java | 15 +- .../catalina/ha/deploy/LocalStrings.properties | 6 + java/org/apache/catalina/ha/deploy/WarWatcher.java | 24 ++- java/org/apache/catalina/startup/Bootstrap.java | 24 ++- .../org/apache/catalina/startup/ContextConfig.java | 2 +- .../catalina/startup/LocalStrings.properties | 5 +- java/org/apache/catalina/startup/Tomcat.java | 39 +++- .../catalina/startup/VersionLoggerListener.java | 32 ++- .../tribes/tipis/AbstractReplicatedMap.java | 59 ++++-- .../catalina/tribes/tipis/LazyReplicatedMap.java | 5 + .../catalina/tribes/tipis/ReplicatedMap.java | 74 +++++++ .../catalina/webresources/AbstractResourceSet.java | 11 + .../catalina/webresources/EmptyResourceSet.java | 11 + .../apache/catalina/webresources/StandardRoot.java | 5 +- .../coyote/http11/AbstractHttp11Processor.java | 6 +- .../apache/jasper/compiler/ELFunctionMapper.java | 94 +++++---- java/org/apache/jasper/compiler/Generator.java | 2 +- java/org/apache/jasper/compiler/Validator.java | 11 +- .../jasper/resources/LocalStrings.properties | 1 - .../jasper/resources/LocalStrings_es.properties | 1 - .../jasper/resources/LocalStrings_ja.properties | 1 - .../jasper/runtime/ProtectedFunctionMapper.java | 55 +++-- java/org/apache/juli/WebappProperties.java | 20 +- .../util/bcel/classfile/FastDataInputStream.java | 234 --------------------- java/org/apache/tomcat/util/buf/UEncoder.java | 71 +++++-- res/maven/mvn.properties.default | 2 +- .../apache/catalina/core/TestStandardContext.java | 3 +- .../apache/catalina/core/TesterTldListener.java | 16 +- .../apache/catalina/filters/TestCorsFilter.java | 74 ++++++- .../catalina/filters/TesterFilterConfigs.java | 18 ++ .../catalina/ha/context/TestReplicatedContext.java | 73 +++++++ .../org/apache/catalina/startup/TestBootstrap.java | 60 ++++++ test/org/apache/catalina/startup/TestTomcat.java | 109 ++++++++++ .../catalina/webresources/TestResourceJars.java | 51 +++++ test/org/apache/el/TestELInJsp.java | 16 ++ test/org/apache/tomcat/util/buf/TestUEncoder.java | 27 +++ test/webapp/bug5nnnn/bug57441.jsp | 22 ++ test/webresources/non-static-resources.jar | Bin 0 -> 1681 bytes webapps/docs/changelog.xml | 111 +++++++++- webapps/docs/config/listeners.xml | 6 + 48 files changed, 1113 insertions(+), 395 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
