[jetty9] 04/05: Merge tag 'upstream/9.2.18'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Jul 28 11:40:33 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jetty9.

commit ea0820f9033a72a4e125428dc102e50c529f844a
Merge: 9b6e30c 495bd5d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 28 13:28:30 2016 +0200

    Merge tag 'upstream/9.2.18'
    
    Upstream version 9.2.18

 VERSION.txt                                        |   8 +
 aggregates/jetty-all/pom.xml                       |   2 +-
 apache-jsp/pom.xml                                 |   2 +-
 apache-jstl/pom.xml                                |   2 +-
 examples/async-rest/async-rest-jar/pom.xml         |   2 +-
 examples/async-rest/async-rest-webapp/pom.xml      |   2 +-
 examples/async-rest/pom.xml                        |   2 +-
 examples/embedded/pom.xml                          |   2 +-
 examples/pom.xml                                   |   2 +-
 jetty-alpn/jetty-alpn-client/pom.xml               |   2 +-
 jetty-alpn/jetty-alpn-server/pom.xml               |   2 +-
 .../modules/protonego-impl/alpn-1.8.0_101.mod      |   8 +
 .../modules/protonego-impl/alpn-1.8.0_102.mod      |   8 +
 jetty-alpn/pom.xml                                 |   2 +-
 jetty-annotations/pom.xml                          |   2 +-
 jetty-ant/pom.xml                                  |   2 +-
 jetty-cdi/pom.xml                                  |   2 +-
 jetty-client/pom.xml                               |   2 +-
 jetty-continuation/pom.xml                         |   2 +-
 jetty-deploy/pom.xml                               |   2 +-
 jetty-distribution/pom.xml                         |   2 +-
 jetty-fcgi/fcgi-client/pom.xml                     |   2 +-
 jetty-fcgi/fcgi-server/pom.xml                     |   2 +-
 .../fcgi/server/proxy/FastCGIProxyServlet.java     |   3 +
 jetty-fcgi/pom.xml                                 |   2 +-
 jetty-http-spi/pom.xml                             |   2 +-
 jetty-http/pom.xml                                 |   2 +-
 jetty-io/pom.xml                                   |   2 +-
 jetty-jaas/pom.xml                                 |   2 +-
 .../eclipse/jetty/jaas/spi/LdapLoginModule.java    |  10 ++
 jetty-jaspi/pom.xml                                |   2 +-
 jetty-jmx/pom.xml                                  |   2 +-
 jetty-jndi/pom.xml                                 |   2 +-
 jetty-jsp/pom.xml                                  |   2 +-
 jetty-jspc-maven-plugin/pom.xml                    |   2 +-
 jetty-maven-plugin/pom.xml                         |   2 +-
 jetty-monitor/pom.xml                              |   2 +-
 jetty-nosql/pom.xml                                |   2 +-
 .../jetty/nosql/mongodb/MongoSessionIdManager.java |  23 ++-
 jetty-osgi/jetty-osgi-alpn/pom.xml                 |   2 +-
 jetty-osgi/jetty-osgi-boot-jsp/pom.xml             |   2 +-
 jetty-osgi/jetty-osgi-boot-warurl/pom.xml          |   2 +-
 jetty-osgi/jetty-osgi-boot/pom.xml                 |   2 +-
 jetty-osgi/jetty-osgi-httpservice/pom.xml          |   2 +-
 jetty-osgi/pom.xml                                 |   2 +-
 jetty-osgi/test-jetty-osgi-context/pom.xml         |   2 +-
 jetty-osgi/test-jetty-osgi-webapp/pom.xml          |   2 +-
 jetty-osgi/test-jetty-osgi/pom.xml                 |   2 +-
 .../test-jetty-osgi/src/test/config/etc/keystore   | Bin 1416 -> 3697 bytes
 jetty-plus/pom.xml                                 |   2 +-
 jetty-proxy/pom.xml                                |   2 +-
 jetty-quickstart/pom.xml                           |   2 +-
 jetty-rewrite/pom.xml                              |   2 +-
 jetty-runner/pom.xml                               |   2 +-
 jetty-security/pom.xml                             |   2 +-
 jetty-server/pom.xml                               |   2 +-
 jetty-server/src/test/resources/keystore           | Bin 1426 -> 3697 bytes
 jetty-servlet/pom.xml                              |   2 +-
 .../jetty/servlet/ServletContextResourcesTest.java | 134 ++++++++++++++
 .../test/resources/contextResources/content.txt    |   1 +
 jetty-servlets/pom.xml                             |   2 +-
 .../main/java/org/eclipse/jetty/servlets/CGI.java  |  95 +++++-----
 jetty-spdy/pom.xml                                 |   2 +-
 jetty-spdy/spdy-alpn-tests/pom.xml                 |   2 +-
 jetty-spdy/spdy-client/pom.xml                     |   2 +-
 jetty-spdy/spdy-core/pom.xml                       |   2 +-
 jetty-spdy/spdy-example-webapp/pom.xml             |   2 +-
 jetty-spdy/spdy-http-client-transport/pom.xml      |   2 +-
 jetty-spdy/spdy-http-common/pom.xml                |   2 +-
 jetty-spdy/spdy-http-server/pom.xml                |   2 +-
 jetty-spdy/spdy-server/pom.xml                     |   2 +-
 jetty-spring/pom.xml                               |   2 +-
 jetty-start/pom.xml                                |   2 +-
 .../modules/protonego-impl/alpn-1.8.0_101.mod      |   8 +
 .../modules/protonego-impl/alpn-1.8.0_102.mod      |   8 +
 jetty-util-ajax/pom.xml                            |   2 +-
 jetty-util/pom.xml                                 |   2 +-
 jetty-webapp/pom.xml                               |   2 +-
 .../javax-websocket-client-impl/pom.xml            |   2 +-
 .../jetty/websocket/jsr356/JsrExtension.java       |  17 ++
 .../websocket/jsr356/annotations/JsrCallable.java  |   6 +-
 .../jsr356/annotations/JsrParamIdBinary.java       |  11 +-
 .../jsr356/annotations/JsrParamIdDecoder.java      |   5 +-
 .../jsr356/annotations/JsrParamIdPong.java         |   3 +-
 .../jsr356/annotations/JsrParamIdText.java         |  34 ++--
 .../jsr356/annotations/OnCloseCallable.java        |   5 +-
 .../jsr356/annotations/OnErrorCallable.java        |   3 +-
 .../annotations/OnMessageBinaryCallable.java       |   6 +-
 .../jsr356/annotations/OnMessageCallable.java      |  25 +--
 .../jsr356/annotations/OnMessageTextCallable.java  |   6 +-
 .../jsr356/annotations/OnOpenCallable.java         |   5 +-
 .../websocket/jsr356/decoders/TimeDecoder.java     |   1 +
 .../javax-websocket-server-impl/pom.xml            |   2 +-
 .../websocket/jsr356/server/ConfiguratorTest.java  | 199 ++++++++++++++++-----
 jetty-websocket/pom.xml                            |   2 +-
 jetty-websocket/websocket-api/pom.xml              |   2 +-
 jetty-websocket/websocket-client/pom.xml           |   2 +-
 jetty-websocket/websocket-common/pom.xml           |   2 +-
 jetty-websocket/websocket-server/pom.xml           |   2 +-
 jetty-websocket/websocket-servlet/pom.xml          |   2 +-
 jetty-xml/pom.xml                                  |   2 +-
 pom.xml                                            |  30 +++-
 tests/pom.xml                                      |   2 +-
 tests/test-continuation/pom.xml                    |   2 +-
 tests/test-integration/pom.xml                     |   2 +-
 tests/test-jmx/jmx-webapp-it/pom.xml               |   2 +-
 tests/test-jmx/jmx-webapp/pom.xml                  |   2 +-
 tests/test-jmx/pom.xml                             |   2 +-
 tests/test-loginservice/pom.xml                    |   2 +-
 tests/test-quickstart/pom.xml                      |   2 +-
 tests/test-sessions/pom.xml                        |   2 +-
 tests/test-sessions/test-hash-sessions/pom.xml     |   2 +-
 tests/test-sessions/test-jdbc-sessions/pom.xml     |   2 +-
 tests/test-sessions/test-mongodb-sessions/pom.xml  |   2 +-
 tests/test-sessions/test-sessions-common/pom.xml   |   2 +-
 tests/test-webapps/pom.xml                         |   2 +-
 tests/test-webapps/test-jaas-webapp/pom.xml        |   2 +-
 tests/test-webapps/test-jetty-webapp/pom.xml       |   2 +-
 tests/test-webapps/test-jndi-webapp/pom.xml        |   2 +-
 tests/test-webapps/test-mock-resources/pom.xml     |   2 +-
 tests/test-webapps/test-proxy-webapp/pom.xml       |   2 +-
 tests/test-webapps/test-servlet-spec/pom.xml       |   2 +-
 .../test-container-initializer/pom.xml             |   2 +-
 .../test-servlet-spec/test-spec-webapp/pom.xml     |   2 +-
 .../test-servlet-spec/test-web-fragment/pom.xml    |   2 +-
 tests/test-webapps/test-webapp-rfc2616/pom.xml     |   2 +-
 126 files changed, 595 insertions(+), 263 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git



More information about the pkg-java-commits mailing list