Merge branch 'master' into release-9
diff --git a/VERSION.txt b/VERSION.txt
index 7b8a856..9d54468 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,102 @@
-jetty-9.2.0-SNAPSHOT
+jetty-9.2.0.M1 - 08 May 2014
+ + 367680 jsp-file with load-on-startup not precompiled
+ + 404511 removed deprecated StringMap
+ + 409105 Upgrade jetty-osgi build/test to use more recent pax junit test
+ framework
+ + 424982 improved PID check in jetty.sh
+ + 425421 ContainerLifeCycle does not start added beans in started state
+ + 428904 Add logging of which webapp has path with uncovered http methods
+ + 431094 Consistent handling of utf8 decoding errors
+ + 431459 Jetty WebSocket compression extensions fails to handle big messages
+ properly
+ + 431519 Fixed NetworkTrafficListener
+ + 431642 Implement ProxyServlet using Servlet 3.1 async I/O.
+ + 432145 Pending request is not failed when HttpClient is stopped.
+ + 432270 Slow requests with response content delimited by EOF fail.
+ + 432321 jetty-start / Allow defining extra start directories for common
+ configurations
+ + 432468 Improve command CGI path handling
+ + 432473 web.xml declaration order of filters not preserved on calls to init()
+ + 432483 make osgi.serviceloader support for
+ javax.servlet.ServletContainerInitializer optional (cherry picked from
+ commit 31043d25708edbea9ef31948093f4eaf2247919b)
+ + 432528 IllegalStateException when using DeferredContentProvider.
+ + 432777 Async Write Loses Data with HTTPS Server.
+ + 432901 ensure a single onError callback only in pending and unready states
+ + 432993 Improve handling of ProxyTo and Prefix parameters in
+ ProxyServlet.Transparent.
+ + 433244 Security manager lifecycle cleanup
+ + 433262 WebSocket / Advanced close use cases
+ + 433365 No such servlet:
+ __org.eclipse.jetty.servlet.JspPropertyGroupServlet__
+ + 433370 PATCH method does not work with ProxyServlet.
+ + 433431 Support ServletHandler fall through
+ + 433479 Improved resource javadoc
+ + 433483 sync log initialize
+ + 433512 Jetty throws RuntimeException when webapp compiled with jdk8
+ -parameters
+ + 433563 Jetty fails to startup on windows - InvalidPathException
+ + 433572 default to sending date header
+ + 433656 Change to Opcode.ASM5 breaks jetty-osgi
+ + 433692 improved buffer resizing
+ + 433708 Improve WebAppClassLoader.addClassPath() IllegalStateException
+ message
+ + 433793 WebSocket / empty protocol list in ServerEndpointConfig.Configurator
+ when using non-exact header name
+ + 433841 Resource.newResource() declares an exception it does not throw
+ + 433849 FileResource string compare fix
+ + 433916 HttpChannelOverHttp handles HTTP 1.0 connection reuse incorrectly.
+ + 434009 Improved javadoc for accessing HttpChannel and HttpConnection
+ + 434027 ReadListener.onError() not invoked in case of read failures.
+ + 434056 Support content consumed asynchronously.
+ + 434074 Avoid double dispatch by returning false from messageComplete
+ + 434077 AnnotatedServerEndpointTest emits strange exception
+ + 434247 Redirect loop in FastCGI proxying for HTTPS sites.
+
+jetty-9.2.0.M0 - 09 April 2014
+ + 419801 Upgrade to asm5 for jdk8
+ + 423392 Fix buffer overflow in AsyncGzipFilter
+ + 425736 jetty-start / Jetty 9 fails to startup with --exec option if Java
+ path contain
+ + 426920 jetty-start / BaseHome.listFilesRegex() and .recurseDir() do not
+ detect filesystem loops
+ + 427188 Re-enable automatic detection of logging-dependencies with
+ logging-module
+ + 429734 Implemented the HA ProxyProtocol
+ + 430341 use apache jsp/jstl for maven plugins
+ + 430747 jetty-start / Allow --lib and module [lib] to recursively add jars
+ + 430825 jetty-start / use of jetty-jmx.xml prevents configuration of
+ ThreadPool in jetty.xml
+ + 431279 jetty-start / Unable to start jetty if no properties are defined.
+ + 431892 DefaultFileLocatorHelper.getBundleInstallLocation fails for equinox
+ 3.10
+ + 432122 ignore frequently failing test
+ + 432145 Pending request is not failed when HttpClient is stopped.
+ + 432270 Slow requests with response content delimited by EOF fail.
+
+jetty-9.1.5.v20140505 - 05 May 2014
+ + 431459 Jetty WebSocket compression extensions fails to handle big messages
+ properly
+ + 431519 Fixed NetworkTrafficListener
+ + 432145 Pending request is not failed when HttpClient is stopped.
+ + 432270 Slow requests with response content delimited by EOF fail.
+ + 432473 web.xml declaration order of filters not preserved on calls to init()
+ + 432483 make osgi.serviceloader support for
+ javax.servlet.ServletContainerInitializer optional (cherry picked from
+ commit 31043d25708edbea9ef31948093f4eaf2247919b)
+ + 432528 IllegalStateException when using DeferredContentProvider.
+ + 432777 Async Write Loses Data with HTTPS Server.
+ + 432901 ensure a single onError callback only in pending and unready states
+ + 432993 Improve handling of ProxyTo and Prefix parameters in
+ ProxyServlet.Transparent.
+ + 433365 No such servlet:
+ __org.eclipse.jetty.servlet.JspPropertyGroupServlet__ (cherry picked from
+ commit e2ed934978b958d6fccb28a8a5d04768f7c0432d)
+ + 433370 PATCH method does not work with ProxyServlet.
+ + 433483 sync log initialize
+ + 433692 improved buffer resizing
+ + 433916 HttpChannelOverHttp handles HTTP 1.0 connection reuse incorrectly.
+ + 434027 ReadListener.onError() not invoked in case of read failures.
jetty-9.1.4.v20140401 - 01 April 2014
+ 414206 Rewrite rules re-encode requestURI
diff --git a/jetty-spdy/spdy-alpn-tests/pom.xml b/jetty-spdy/spdy-alpn-tests/pom.xml
index 393532c..d764d4a 100644
--- a/jetty-spdy/spdy-alpn-tests/pom.xml
+++ b/jetty-spdy/spdy-alpn-tests/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.eclipse.jetty.spdy</groupId>
<artifactId>spdy-parent</artifactId>
