From ecba378f5c3603fecf677fb47aeb88a0a7b20935 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt
Date: Fri, 6 Nov 2015 10:32:14 -0700
Subject: Updating to version 9.2.14.v20151106
---
VERSION.txt | 20 +++++++++++++++++++-
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 +-
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 +-
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 +-
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-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 +-
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-servlet/pom.xml | 2 +-
jetty-servlets/pom.xml | 2 +-
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 +-
jetty-util-ajax/pom.xml | 2 +-
jetty-util/pom.xml | 2 +-
jetty-webapp/pom.xml | 2 +-
jetty-websocket/javax-websocket-client-impl/pom.xml | 2 +-
jetty-websocket/javax-websocket-server-impl/pom.xml | 2 +-
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 | 2 +-
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 +-
100 files changed, 118 insertions(+), 100 deletions(-)
diff --git a/VERSION.txt b/VERSION.txt
index bb7e494468..87841abd2c 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,22 @@
-jetty-9.2.14-SNAPSHOT
+jetty-9.2.14.v20151106 - 06 November 2015
+ + 428474 Expose batch mode in the Jetty WebSocket API
+ + 471055 Restore legacy/experimental WebSocket extensions (deflate-frame)
+ + 472082 isOpen returns true on CLOSING Connection
+ + 474068 Update WebSocket Extension for permessage-deflate draft-22
+ + 474319 Reintroduce blocking connect().
+ + 474321 Allow synchronous address resolution.
+ + 474453 Tiny buffers (under 7 bytes) fail to compress in permessage-deflate
+ + 474454 Backport permessage-deflate from Jetty 9.3.x to 9.2.x
+ + 474936 WebSocketSessions are not always cleaned out from openSessions
+ + 476023 Incorrect trimming of WebSocket close reason
+ + 476049 When using WebSocket Session.close() there should be no status code
+ or reason sent
+ + 477385 Problem in MANIFEST.MF with version 9.2.10 / 9.2.13.
+ + 477817 Fixed memory leak in QueuedThreadPool
+ + 481006 SSL requests intermittently fail with EOFException when SSL
+ renegotiation is disallowed.
+ + 481236 Make ShutdownMonitor java security manager friendly
+ + 481437 Port ConnectHandler connect and context functionality from Jetty 8.
jetty-9.2.13.v20150730 - 30 July 2015
+ 472859 ConcatServlet may expose protected resources.
diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml
index 7a80ca4147..4822f20d70 100644
--- a/aggregates/jetty-all/pom.xml
+++ b/aggregates/jetty-all/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../../pom.xml
4.0.0
diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml
index 073700b412..289fe9cbde 100644
--- a/apache-jsp/pom.xml
+++ b/apache-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
apache-jsp
diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml
index 61902c3797..1ce7acdc67 100644
--- a/apache-jstl/pom.xml
+++ b/apache-jstl/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
apache-jstl
diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml
index 545442aa1d..694c159647 100644
--- a/examples/async-rest/async-rest-jar/pom.xml
+++ b/examples/async-rest/async-rest-jar/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
example-async-rest
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
org.eclipse.jetty.example-async-rest
diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml
index e94b85c8a8..b89d002e22 100644
--- a/examples/async-rest/async-rest-webapp/pom.xml
+++ b/examples/async-rest/async-rest-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
example-async-rest
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
org.eclipse.jetty.example-async-rest
diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml
index 104b0047e5..343f8eed4b 100644
--- a/examples/async-rest/pom.xml
+++ b/examples/async-rest/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.examples
examples-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
4.0.0
diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml
index d91241760e..bdcde89973 100644
--- a/examples/embedded/pom.xml
+++ b/examples/embedded/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.examples
examples-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
4.0.0
diff --git a/examples/pom.xml b/examples/pom.xml
index 1758ee74d8..3ac44a886d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
org.eclipse.jetty.examples
diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml
index 26af2c6858..684152b80f 100644
--- a/jetty-alpn/jetty-alpn-client/pom.xml
+++ b/jetty-alpn/jetty-alpn-client/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-alpn-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-alpn-client
diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml
index 5791632e3c..fc4e04cb41 100644
--- a/jetty-alpn/jetty-alpn-server/pom.xml
+++ b/jetty-alpn/jetty-alpn-server/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-alpn-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-alpn-server
diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml
index fb19f5445a..fbb086de0b 100644
--- a/jetty-alpn/pom.xml
+++ b/jetty-alpn/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-alpn-parent
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index d47628ee04..0b8315f130 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-annotations
diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml
index f1703b6663..1b46a25de5 100644
--- a/jetty-ant/pom.xml
+++ b/jetty-ant/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-ant
diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml
index 4d5d6ec610..164a751e16 100644
--- a/jetty-cdi/pom.xml
+++ b/jetty-cdi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-cdi
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index 64aac0c73c..d61952c4bb 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 1a51dbbdb7..07fb51d79f 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-continuation
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index 6be302335b..5b64a469ab 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-deploy
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 488a8607db..c98f2f42e3 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
jetty-distribution
Jetty :: Distribution Assemblies
diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml
index c76a44b704..76898df927 100644
--- a/jetty-fcgi/fcgi-client/pom.xml
+++ b/jetty-fcgi/fcgi-client/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.fcgi
fcgi-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml
index d6e5429d4d..ceab71ff23 100644
--- a/jetty-fcgi/fcgi-server/pom.xml
+++ b/jetty-fcgi/fcgi-server/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.fcgi
fcgi-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml
index a8b374e928..9cdcc68788 100644
--- a/jetty-fcgi/pom.xml
+++ b/jetty-fcgi/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
index a6be593da9..6007a54f45 100644
--- a/jetty-http-spi/pom.xml
+++ b/jetty-http-spi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-http-spi
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index aba3add997..811f068875 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-http
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index 0d82512078..0f843b990c 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -2,7 +2,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-io
diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml
index 9b796c1a04..4713499da0 100644
--- a/jetty-jaas/pom.xml
+++ b/jetty-jaas/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-jaas
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index b7970bf7f2..595249557e 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-jaspi
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index ae20e5e2bb..deec0b281a 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-jmx
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index 79910d73f7..a8775b8033 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-jndi
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
index 92d7139bdf..f434404e94 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-jsp
diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml
index 281b1a0168..a2b5351474 100644
--- a/jetty-jspc-maven-plugin/pom.xml
+++ b/jetty-jspc-maven-plugin/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-jspc-maven-plugin
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 089149d93f..82c0c08355 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-maven-plugin
diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml
index f92a49b360..85856cf2df 100644
--- a/jetty-monitor/pom.xml
+++ b/jetty-monitor/pom.xml
@@ -19,7 +19,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-monitor
diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml
index ea5615f216..e26da4e0a8 100644
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-nosql
diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml
index bc112a9918..f9f619a790 100644
--- a/jetty-osgi/jetty-osgi-alpn/pom.xml
+++ b/jetty-osgi/jetty-osgi-alpn/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-osgi-alpn
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 371f96c8f4..c97a52cd6e 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-osgi-boot-jsp
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
index 57df7dd677..119cdb949f 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 99b7002191..54b4e9ac30 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-osgi-boot
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index e0bd5345ee..2133c0200f 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-httpservice
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index 2a4b82d3d7..d94bf50705 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
org.eclipse.jetty.osgi
jetty-osgi-project
diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml
index 6dd58d09bb..01789258a6 100644
--- a/jetty-osgi/test-jetty-osgi-context/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-context/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
test-jetty-osgi-context
diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
index 21cfdc3c57..c8a10e3027 100644
--- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
4.0.0
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 79e1aa80f3..45992b279d 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
4.0.0
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index a796b34644..26a7135ea6 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-plus
diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml
index 9f2b952dba..63dc9d649d 100644
--- a/jetty-proxy/pom.xml
+++ b/jetty-proxy/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-proxy
diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml
index 28b8177792..34bdb1fdb4 100644
--- a/jetty-quickstart/pom.xml
+++ b/jetty-quickstart/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
org.eclipse.jetty
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index 5738a6465b..a405335fa5 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-rewrite
diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index d3a7b958ea..00bc2d9ed1 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-runner
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index 45f0f6df5c..af455bd0e8 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-security
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index cf63395c8b..d483f06986 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-server
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index b2fb0ee113..9c5afadfef 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-servlet
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 3d54664b6f..4dee3047ec 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-servlets
diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml
index 4d17d0a38f..8b100de9bf 100644
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-spdy/spdy-alpn-tests/pom.xml b/jetty-spdy/spdy-alpn-tests/pom.xml
index 86469c9246..118cffdb46 100644
--- a/jetty-spdy/spdy-alpn-tests/pom.xml
+++ b/jetty-spdy/spdy-alpn-tests/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml
index 406ea8e1ee..314f276aa8 100644
--- a/jetty-spdy/spdy-client/pom.xml
+++ b/jetty-spdy/spdy-client/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml
index 62f69d3184..cc0f74ad5d 100644
--- a/jetty-spdy/spdy-core/pom.xml
+++ b/jetty-spdy/spdy-core/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml
index ddd4791101..413d78b4e6 100644
--- a/jetty-spdy/spdy-example-webapp/pom.xml
+++ b/jetty-spdy/spdy-example-webapp/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
spdy-example-webapp
diff --git a/jetty-spdy/spdy-http-client-transport/pom.xml b/jetty-spdy/spdy-http-client-transport/pom.xml
index 8f2192e6d0..074d72c977 100644
--- a/jetty-spdy/spdy-http-client-transport/pom.xml
+++ b/jetty-spdy/spdy-http-client-transport/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-spdy/spdy-http-common/pom.xml b/jetty-spdy/spdy-http-common/pom.xml
index 73030faf8d..3da3d18ab0 100644
--- a/jetty-spdy/spdy-http-common/pom.xml
+++ b/jetty-spdy/spdy-http-common/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml
index a6ec456f4d..00f82f7430 100644
--- a/jetty-spdy/spdy-http-server/pom.xml
+++ b/jetty-spdy/spdy-http-server/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
spdy-http-server
diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml
index cd22bd9afe..1ab698dfb9 100644
--- a/jetty-spdy/spdy-server/pom.xml
+++ b/jetty-spdy/spdy-server/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml
index 19fc269b25..fa5c056088 100644
--- a/jetty-spring/pom.xml
+++ b/jetty-spring/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-spring
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
index 16b33e1476..f3e92cbed3 100644
--- a/jetty-start/pom.xml
+++ b/jetty-start/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-start
diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml
index 3b41d7be44..1f377d4255 100644
--- a/jetty-util-ajax/pom.xml
+++ b/jetty-util-ajax/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-util-ajax
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index a86fe0e4cf..ca3cfad040 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-util
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 1b40cfba30..3c3ff715de 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-webapp
diff --git a/jetty-websocket/javax-websocket-client-impl/pom.xml b/jetty-websocket/javax-websocket-client-impl/pom.xml
index 688db734c0..432bc36b2f 100644
--- a/jetty-websocket/javax-websocket-client-impl/pom.xml
+++ b/jetty-websocket/javax-websocket-client-impl/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml
index f44666f0ae..3abcac195a 100644
--- a/jetty-websocket/javax-websocket-server-impl/pom.xml
+++ b/jetty-websocket/javax-websocket-server-impl/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 5637948779..527c1d53d4 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml
index 9e4e1e343e..645e250cdf 100644
--- a/jetty-websocket/websocket-api/pom.xml
+++ b/jetty-websocket/websocket-api/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml
index d6f24c79c4..eb780a50c0 100644
--- a/jetty-websocket/websocket-client/pom.xml
+++ b/jetty-websocket/websocket-client/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml
index 9d548b7f39..913d94c33f 100644
--- a/jetty-websocket/websocket-common/pom.xml
+++ b/jetty-websocket/websocket-common/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml
index d6f636d66d..b75b054be4 100644
--- a/jetty-websocket/websocket-server/pom.xml
+++ b/jetty-websocket/websocket-server/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
index ef2a8b237e..b98ff08e50 100644
--- a/jetty-websocket/websocket-servlet/pom.xml
+++ b/jetty-websocket/websocket-servlet/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index e52033c6e6..177946faf9 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jetty-xml
diff --git a/pom.xml b/pom.xml
index 4b6b945a00..721bb532a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
23
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
Jetty :: Project
http://www.eclipse.org/jetty
pom
diff --git a/tests/pom.xml b/tests/pom.xml
index 85139fafb3..ed980c1ff6 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
org.eclipse.jetty.tests
diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml
index 072c8fb0ac..ced7883e18 100644
--- a/tests/test-continuation/pom.xml
+++ b/tests/test-continuation/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
4.0.0
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index b6908ff4fe..64b835bf1a 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
test-integration
diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml
index 0d85932528..d887ed3af6 100644
--- a/tests/test-jmx/jmx-webapp-it/pom.xml
+++ b/tests/test-jmx/jmx-webapp-it/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
test-jmx-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
jmx-webapp-it
diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml
index ac1e6671c6..36a23e26a3 100644
--- a/tests/test-jmx/jmx-webapp/pom.xml
+++ b/tests/test-jmx/jmx-webapp/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-jmx-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
jmx-webapp
war
diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml
index ee79a7184d..fdeaed5436 100644
--- a/tests/test-jmx/pom.xml
+++ b/tests/test-jmx/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
4.0.0
test-jmx-parent
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index 811af3d4a8..802e820125 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-loginservice
Jetty Tests :: Login Service
diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml
index d2c95f48a6..35b8fb2fae 100644
--- a/tests/test-quickstart/pom.xml
+++ b/tests/test-quickstart/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
4.0.0
diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml
index 7d2f728bed..fb4f9250e1 100644
--- a/tests/test-sessions/pom.xml
+++ b/tests/test-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-sessions-parent
Jetty Tests :: Sessions :: Parent
diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml
index eb4d6ca3aa..74e8a128f9 100644
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-hash-sessions
Jetty Tests :: Sessions :: Hash
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index e57fef922e..e03ee96a49 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-jdbc-sessions
Jetty Tests :: Sessions :: JDBC
diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml
index 968e979790..622b5e6ada 100644
--- a/tests/test-sessions/test-mongodb-sessions/pom.xml
+++ b/tests/test-sessions/test-mongodb-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-mongodb-sessions
Jetty Tests :: Sessions :: Mongo
diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml
index cca05af2b0..7c55770e00 100644
--- a/tests/test-sessions/test-sessions-common/pom.xml
+++ b/tests/test-sessions/test-sessions-common/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-sessions-common
Jetty Tests :: Sessions :: Common
diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml
index f27ff42ae1..302cb279d0 100644
--- a/tests/test-webapps/pom.xml
+++ b/tests/test-webapps/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
test-webapps-parent
diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml
index 80943400ec..34271244d0 100644
--- a/tests/test-webapps/test-jaas-webapp/pom.xml
+++ b/tests/test-webapps/test-jaas-webapp/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-jaas-webapp
Jetty Tests :: WebApp :: JAAS
diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml
index 5921f346de..4c8b45429d 100644
--- a/tests/test-webapps/test-jetty-webapp/pom.xml
+++ b/tests/test-webapps/test-jetty-webapp/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
4.0.0
diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml
index e085f3abd0..0bf072c209 100644
--- a/tests/test-webapps/test-jndi-webapp/pom.xml
+++ b/tests/test-webapps/test-jndi-webapp/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-jndi-webapp
Jetty Tests :: WebApp :: JNDI
diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml
index 37d6669de6..3c24e58b5d 100644
--- a/tests/test-webapps/test-mock-resources/pom.xml
+++ b/tests/test-webapps/test-mock-resources/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
Jetty Tests :: WebApp :: Mock Resources
test-mock-resources
diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml
index a7da943454..019ae91dc8 100644
--- a/tests/test-webapps/test-proxy-webapp/pom.xml
+++ b/tests/test-webapps/test-proxy-webapp/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
../pom.xml
4.0.0
diff --git a/tests/test-webapps/test-servlet-spec/pom.xml b/tests/test-webapps/test-servlet-spec/pom.xml
index 9b0b7122eb..b400942c42 100644
--- a/tests/test-webapps/test-servlet-spec/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-servlet-spec-parent
Jetty Tests :: Spec Test WebApp :: Parent
diff --git a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
index 662ea8342d..eb6a92122f 100644
--- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.tests
test-servlet-spec-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-container-initializer
jar
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
index c137eff7d5..2b4a0863a2 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty.tests
test-servlet-spec-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
Jetty Tests :: Webapps :: Spec Webapp
test-spec-webapp
diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
index 2e108355b9..76d7f78d33 100644
--- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.tests
test-servlet-spec-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar
org.eclipse.jetty.tests
diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml
index e04db7d3d0..1237b5051c 100644
--- a/tests/test-webapps/test-webapp-rfc2616/pom.xml
+++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14-SNAPSHOT
+ 9.2.14.v20151106
test-webapp-rfc2616
Jetty Tests :: WebApp :: RFC2616
--
cgit v1.2.3
From ec8f8d3e4f743081711edd993f5ab4600a8cf759 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt
Date: Fri, 6 Nov 2015 11:06:48 -0700
Subject: Updating to version 9.2.15-SNAPSHOT
---
VERSION.txt | 2 ++
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 +-
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 +-
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 +-
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-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 +-
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-servlet/pom.xml | 2 +-
jetty-servlets/pom.xml | 2 +-
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 +-
jetty-util-ajax/pom.xml | 2 +-
jetty-util/pom.xml | 2 +-
jetty-webapp/pom.xml | 2 +-
jetty-websocket/javax-websocket-client-impl/pom.xml | 2 +-
jetty-websocket/javax-websocket-server-impl/pom.xml | 2 +-
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 | 2 +-
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 +-
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml | 2 +-
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml | 2 +-
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml | 2 +-
tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +-
100 files changed, 101 insertions(+), 99 deletions(-)
diff --git a/VERSION.txt b/VERSION.txt
index 87841abd2c..608b2c5f5a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,3 +1,5 @@
+jetty-9.2.15-SNAPSHOT
+
jetty-9.2.14.v20151106 - 06 November 2015
+ 428474 Expose batch mode in the Jetty WebSocket API
+ 471055 Restore legacy/experimental WebSocket extensions (deflate-frame)
diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml
index 4822f20d70..c3778ea5e2 100644
--- a/aggregates/jetty-all/pom.xml
+++ b/aggregates/jetty-all/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml
index 289fe9cbde..0070cd4fba 100644
--- a/apache-jsp/pom.xml
+++ b/apache-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
apache-jsp
diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml
index 1ce7acdc67..9b16c2ffc3 100644
--- a/apache-jstl/pom.xml
+++ b/apache-jstl/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
apache-jstl
diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml
index 694c159647..1d29910ec7 100644
--- a/examples/async-rest/async-rest-jar/pom.xml
+++ b/examples/async-rest/async-rest-jar/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
example-async-rest
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
org.eclipse.jetty.example-async-rest
diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml
index b89d002e22..4fb2e43170 100644
--- a/examples/async-rest/async-rest-webapp/pom.xml
+++ b/examples/async-rest/async-rest-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
example-async-rest
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
org.eclipse.jetty.example-async-rest
diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml
index 343f8eed4b..46aaac6a06 100644
--- a/examples/async-rest/pom.xml
+++ b/examples/async-rest/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.examples
examples-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
4.0.0
diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml
index bdcde89973..c41d535cc0 100644
--- a/examples/embedded/pom.xml
+++ b/examples/embedded/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.examples
examples-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
4.0.0
diff --git a/examples/pom.xml b/examples/pom.xml
index 3ac44a886d..feaef2fc0f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
org.eclipse.jetty.examples
diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml
index 684152b80f..1a9651eeff 100644
--- a/jetty-alpn/jetty-alpn-client/pom.xml
+++ b/jetty-alpn/jetty-alpn-client/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-alpn-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-alpn-client
diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml
index fc4e04cb41..1949aa90be 100644
--- a/jetty-alpn/jetty-alpn-server/pom.xml
+++ b/jetty-alpn/jetty-alpn-server/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-alpn-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-alpn-server
diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml
index fbb086de0b..502729275a 100644
--- a/jetty-alpn/pom.xml
+++ b/jetty-alpn/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-alpn-parent
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index 0b8315f130..4658dda044 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-annotations
diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml
index 1b46a25de5..b8bf8db22a 100644
--- a/jetty-ant/pom.xml
+++ b/jetty-ant/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-ant
diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml
index 164a751e16..c1a4716ff6 100644
--- a/jetty-cdi/pom.xml
+++ b/jetty-cdi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-cdi
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index d61952c4bb..3ef65d0763 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 07fb51d79f..5ad0c92bf7 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-continuation
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index 5b64a469ab..09a66eeef9 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-deploy
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index c98f2f42e3..c1eabd99fa 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
jetty-distribution
Jetty :: Distribution Assemblies
diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml
index 76898df927..47a1651eb5 100644
--- a/jetty-fcgi/fcgi-client/pom.xml
+++ b/jetty-fcgi/fcgi-client/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.fcgi
fcgi-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml
index ceab71ff23..76feb19546 100644
--- a/jetty-fcgi/fcgi-server/pom.xml
+++ b/jetty-fcgi/fcgi-server/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.fcgi
fcgi-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml
index 9cdcc68788..ec065cb3ca 100644
--- a/jetty-fcgi/pom.xml
+++ b/jetty-fcgi/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
index 6007a54f45..3eee1079e8 100644
--- a/jetty-http-spi/pom.xml
+++ b/jetty-http-spi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-http-spi
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index 811f068875..adc09cda12 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-http
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index 0f843b990c..0f50850736 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -2,7 +2,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-io
diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml
index 4713499da0..60e9d78ec2 100644
--- a/jetty-jaas/pom.xml
+++ b/jetty-jaas/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-jaas
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index 595249557e..84ffab4c3c 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-jaspi
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index deec0b281a..216371f67a 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-jmx
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index a8775b8033..2bd43d0366 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-jndi
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
index f434404e94..d9c998c318 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-jsp
diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml
index a2b5351474..81cd6d99a1 100644
--- a/jetty-jspc-maven-plugin/pom.xml
+++ b/jetty-jspc-maven-plugin/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-jspc-maven-plugin
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 82c0c08355..2f7b5b91ad 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-maven-plugin
diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml
index 85856cf2df..a611122c40 100644
--- a/jetty-monitor/pom.xml
+++ b/jetty-monitor/pom.xml
@@ -19,7 +19,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-monitor
diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml
index e26da4e0a8..10bc138f00 100644
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-nosql
diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml
index f9f619a790..54df7208cd 100644
--- a/jetty-osgi/jetty-osgi-alpn/pom.xml
+++ b/jetty-osgi/jetty-osgi-alpn/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-osgi-alpn
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index c97a52cd6e..34c1f3760d 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-osgi-boot-jsp
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
index 119cdb949f..7561df8eee 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 54b4e9ac30..df32c1f09f 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-osgi-boot
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index 2133c0200f..b77d2cacad 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-httpservice
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index d94bf50705..032cfa7f75 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
org.eclipse.jetty.osgi
jetty-osgi-project
diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml
index 01789258a6..5f06566821 100644
--- a/jetty-osgi/test-jetty-osgi-context/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-context/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
test-jetty-osgi-context
diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
index c8a10e3027..1328ea3f2d 100644
--- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 45992b279d..c2612f1fec 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 26a7135ea6..9fd7b47ab3 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-plus
diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml
index 63dc9d649d..51bf4a7e88 100644
--- a/jetty-proxy/pom.xml
+++ b/jetty-proxy/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-proxy
diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml
index 34bdb1fdb4..8aee9e2517 100644
--- a/jetty-quickstart/pom.xml
+++ b/jetty-quickstart/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
org.eclipse.jetty
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index a405335fa5..31806c6c0a 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-rewrite
diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index 00bc2d9ed1..ef23d56bb3 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-runner
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index af455bd0e8..a14f98488d 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-security
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index d483f06986..6e9e89f208 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-server
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index 9c5afadfef..ebae417f2c 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-servlet
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 4dee3047ec..a1d9bc2140 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-servlets
diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml
index 8b100de9bf..7b5466489c 100644
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-alpn-tests/pom.xml b/jetty-spdy/spdy-alpn-tests/pom.xml
index 118cffdb46..3bca84b9a0 100644
--- a/jetty-spdy/spdy-alpn-tests/pom.xml
+++ b/jetty-spdy/spdy-alpn-tests/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml
index 314f276aa8..7b3bed1ee0 100644
--- a/jetty-spdy/spdy-client/pom.xml
+++ b/jetty-spdy/spdy-client/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml
index cc0f74ad5d..2cb325d492 100644
--- a/jetty-spdy/spdy-core/pom.xml
+++ b/jetty-spdy/spdy-core/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml
index 413d78b4e6..0045fc1cfb 100644
--- a/jetty-spdy/spdy-example-webapp/pom.xml
+++ b/jetty-spdy/spdy-example-webapp/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
spdy-example-webapp
diff --git a/jetty-spdy/spdy-http-client-transport/pom.xml b/jetty-spdy/spdy-http-client-transport/pom.xml
index 074d72c977..1cb3ae6970 100644
--- a/jetty-spdy/spdy-http-client-transport/pom.xml
+++ b/jetty-spdy/spdy-http-client-transport/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-http-common/pom.xml b/jetty-spdy/spdy-http-common/pom.xml
index 3da3d18ab0..769206b738 100644
--- a/jetty-spdy/spdy-http-common/pom.xml
+++ b/jetty-spdy/spdy-http-common/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml
index 00f82f7430..b20584099e 100644
--- a/jetty-spdy/spdy-http-server/pom.xml
+++ b/jetty-spdy/spdy-http-server/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
spdy-http-server
diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml
index 1ab698dfb9..bd16a8646f 100644
--- a/jetty-spdy/spdy-server/pom.xml
+++ b/jetty-spdy/spdy-server/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml
index fa5c056088..07d3d4895a 100644
--- a/jetty-spring/pom.xml
+++ b/jetty-spring/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-spring
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
index f3e92cbed3..17dc1ed7fe 100644
--- a/jetty-start/pom.xml
+++ b/jetty-start/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-start
diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml
index 1f377d4255..49ac9ab881 100644
--- a/jetty-util-ajax/pom.xml
+++ b/jetty-util-ajax/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-util-ajax
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index ca3cfad040..e145f566f9 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-util
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 3c3ff715de..9134dee1b1 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-webapp
diff --git a/jetty-websocket/javax-websocket-client-impl/pom.xml b/jetty-websocket/javax-websocket-client-impl/pom.xml
index 432bc36b2f..dc4763b848 100644
--- a/jetty-websocket/javax-websocket-client-impl/pom.xml
+++ b/jetty-websocket/javax-websocket-client-impl/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml
index 3abcac195a..5abe579554 100644
--- a/jetty-websocket/javax-websocket-server-impl/pom.xml
+++ b/jetty-websocket/javax-websocket-server-impl/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 527c1d53d4..054a2bfd95 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml
index 645e250cdf..425cab0a3e 100644
--- a/jetty-websocket/websocket-api/pom.xml
+++ b/jetty-websocket/websocket-api/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml
index eb780a50c0..06bf8443c1 100644
--- a/jetty-websocket/websocket-client/pom.xml
+++ b/jetty-websocket/websocket-client/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml
index 913d94c33f..56c18599ff 100644
--- a/jetty-websocket/websocket-common/pom.xml
+++ b/jetty-websocket/websocket-common/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml
index b75b054be4..9335a07e63 100644
--- a/jetty-websocket/websocket-server/pom.xml
+++ b/jetty-websocket/websocket-server/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
index b98ff08e50..4dbc6f6040 100644
--- a/jetty-websocket/websocket-servlet/pom.xml
+++ b/jetty-websocket/websocket-servlet/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocket
websocket-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index 177946faf9..d12891be62 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jetty-xml
diff --git a/pom.xml b/pom.xml
index 721bb532a7..cad64aeb77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
23
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
Jetty :: Project
http://www.eclipse.org/jetty
pom
diff --git a/tests/pom.xml b/tests/pom.xml
index ed980c1ff6..8e3233df8c 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty
jetty-project
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
org.eclipse.jetty.tests
diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml
index ced7883e18..b8de79ae02 100644
--- a/tests/test-continuation/pom.xml
+++ b/tests/test-continuation/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
4.0.0
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index 64b835bf1a..6095e6b586 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
test-integration
diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml
index d887ed3af6..1a482ddd91 100644
--- a/tests/test-jmx/jmx-webapp-it/pom.xml
+++ b/tests/test-jmx/jmx-webapp-it/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
test-jmx-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
jmx-webapp-it
diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml
index 36a23e26a3..c4b053ba90 100644
--- a/tests/test-jmx/jmx-webapp/pom.xml
+++ b/tests/test-jmx/jmx-webapp/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-jmx-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
jmx-webapp
war
diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml
index fdeaed5436..38d0126487 100644
--- a/tests/test-jmx/pom.xml
+++ b/tests/test-jmx/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
4.0.0
test-jmx-parent
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index 802e820125..842aa288aa 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-loginservice
Jetty Tests :: Login Service
diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml
index 35b8fb2fae..55b236c062 100644
--- a/tests/test-quickstart/pom.xml
+++ b/tests/test-quickstart/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
4.0.0
diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml
index fb4f9250e1..ae5e15a364 100644
--- a/tests/test-sessions/pom.xml
+++ b/tests/test-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-sessions-parent
Jetty Tests :: Sessions :: Parent
diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml
index 74e8a128f9..1a3f6f818f 100644
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-hash-sessions
Jetty Tests :: Sessions :: Hash
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index e03ee96a49..fd43aa65d3 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-jdbc-sessions
Jetty Tests :: Sessions :: JDBC
diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml
index 622b5e6ada..f049953a0f 100644
--- a/tests/test-sessions/test-mongodb-sessions/pom.xml
+++ b/tests/test-sessions/test-mongodb-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-mongodb-sessions
Jetty Tests :: Sessions :: Mongo
diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml
index 7c55770e00..04c34639d2 100644
--- a/tests/test-sessions/test-sessions-common/pom.xml
+++ b/tests/test-sessions/test-sessions-common/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-sessions-common
Jetty Tests :: Sessions :: Common
diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml
index 302cb279d0..731e61e01e 100644
--- a/tests/test-webapps/pom.xml
+++ b/tests/test-webapps/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
test-webapps-parent
diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml
index 34271244d0..f006e7a6fb 100644
--- a/tests/test-webapps/test-jaas-webapp/pom.xml
+++ b/tests/test-webapps/test-jaas-webapp/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-jaas-webapp
Jetty Tests :: WebApp :: JAAS
diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml
index 4c8b45429d..7fe045b83f 100644
--- a/tests/test-webapps/test-jetty-webapp/pom.xml
+++ b/tests/test-webapps/test-jetty-webapp/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
4.0.0
diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml
index 0bf072c209..f222ff1c02 100644
--- a/tests/test-webapps/test-jndi-webapp/pom.xml
+++ b/tests/test-webapps/test-jndi-webapp/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-jndi-webapp
Jetty Tests :: WebApp :: JNDI
diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml
index 3c24e58b5d..7ead92eed1 100644
--- a/tests/test-webapps/test-mock-resources/pom.xml
+++ b/tests/test-webapps/test-mock-resources/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
Jetty Tests :: WebApp :: Mock Resources
test-mock-resources
diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml
index 019ae91dc8..e885cf9bfe 100644
--- a/tests/test-webapps/test-proxy-webapp/pom.xml
+++ b/tests/test-webapps/test-proxy-webapp/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
../pom.xml
4.0.0
diff --git a/tests/test-webapps/test-servlet-spec/pom.xml b/tests/test-webapps/test-servlet-spec/pom.xml
index b400942c42..2a0f70395c 100644
--- a/tests/test-webapps/test-servlet-spec/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-servlet-spec-parent
Jetty Tests :: Spec Test WebApp :: Parent
diff --git a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
index eb6a92122f..c82a26fc50 100644
--- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.tests
test-servlet-spec-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-container-initializer
jar
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
index 2b4a0863a2..c7fbb241d4 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty.tests
test-servlet-spec-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
Jetty Tests :: Webapps :: Spec Webapp
test-spec-webapp
diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
index 76d7f78d33..d2a5afec0a 100644
--- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.tests
test-servlet-spec-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar
org.eclipse.jetty.tests
diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml
index 1237b5051c..7568150465 100644
--- a/tests/test-webapps/test-webapp-rfc2616/pom.xml
+++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 9.2.14.v20151106
+ 9.2.15-SNAPSHOT
test-webapp-rfc2616
Jetty Tests :: WebApp :: RFC2616
--
cgit v1.2.3
From 8030a4c783437c65bc371cf65f1373c316e5bbd8 Mon Sep 17 00:00:00 2001
From: Greg Wilkins
Date: Wed, 18 Nov 2015 15:44:36 +1100
Subject: 482243 Fixed GzipHandler for Include
---
.../eclipse/jetty/embedded/GzipHandlerTest.java | 125 -------------
.../servlets/gzip/AbstractCompressedStream.java | 11 +-
.../jetty/servlets/gzip/GzipHandlerTest.java | 207 +++++++++++++++++++++
3 files changed, 214 insertions(+), 129 deletions(-)
delete mode 100644 examples/embedded/src/test/java/org/eclipse/jetty/embedded/GzipHandlerTest.java
create mode 100644 jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipHandlerTest.java
diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/GzipHandlerTest.java b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/GzipHandlerTest.java
deleted file mode 100644
index 65a68df0c8..0000000000
--- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/GzipHandlerTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// ========================================================================
-// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-//
-// The Eclipse Public License is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-//
-// You may elect to redistribute this code under either of these licenses.
-// ========================================================================
-//
-
-package org.eclipse.jetty.embedded;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.zip.GZIPInputStream;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.http.HttpTester;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.LocalConnector;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.servlets.gzip.GzipHandler;
-import org.eclipse.jetty.util.IO;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class GzipHandlerTest
-{
- private static String __content =
- "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In quis felis nunc. "+
- "Quisque suscipit mauris et ante auctor ornare rhoncus lacus aliquet. Pellentesque "+
- "habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. "+
- "Vestibulum sit amet felis augue, vel convallis dolor. Cras accumsan vehicula diam "+
- "at faucibus. Etiam in urna turpis, sed congue mi. Morbi et lorem eros. Donec vulputate "+
- "velit in risus suscipit lobortis. Aliquam id urna orci, nec sollicitudin ipsum. "+
- "Cras a orci turpis. Donec suscipit vulputate cursus. Mauris nunc tellus, fermentum "+
- "eu auctor ut, mollis at diam. Quisque porttitor ultrices metus, vitae tincidunt massa "+
- "sollicitudin a. Vivamus porttitor libero eget purus hendrerit cursus. Integer aliquam "+
- "consequat mauris quis luctus. Cras enim nibh, dignissim eu faucibus ac, mollis nec neque. "+
- "Aliquam purus mauris, consectetur nec convallis lacinia, porta sed ante. Suspendisse "+
- "et cursus magna. Donec orci enim, molestie a lobortis eu, imperdiet vitae neque.";
-
- private Server _server;
- private LocalConnector _connector;
-
- @Before
- public void init() throws Exception
- {
- _server = new Server();
- _connector = new LocalConnector(_server);
- _server.addConnector(_connector);
-
- Handler testHandler = new AbstractHandler()
- {
- public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException,
- ServletException
- {
- PrintWriter writer = response.getWriter();
- writer.write(__content);
- writer.close();
-
- baseRequest.setHandled(true);
- }
- };
-
- GzipHandler gzipHandler = new GzipHandler();
- gzipHandler.setHandler(testHandler);
-
- _server.setHandler(gzipHandler);
- _server.start();
- }
-
- @After
- public void destroy() throws Exception
- {
- _server.stop();
- _server.join();
- }
-
- @Test
- public void testGzipHandler() throws Exception
- {
- // generated and parsed test
- HttpTester.Request request = HttpTester.newRequest();
- HttpTester.Response response;
-
- request.setMethod("GET");
- request.setVersion("HTTP/1.0");
- request.setHeader("Host","tester");
- request.setHeader("accept-encoding","gzip");
- request.setURI("/");
-
- response = HttpTester.parseResponse(_connector.getResponses(request.generate()));
-
- assertTrue(response.get("Content-Encoding").equalsIgnoreCase("gzip"));
- assertEquals(HttpServletResponse.SC_OK,response.getStatus());
-
- InputStream testIn = new GZIPInputStream(new ByteArrayInputStream(response.getContentBytes()));
- ByteArrayOutputStream testOut = new ByteArrayOutputStream();
- IO.copy(testIn,testOut);
-
- assertEquals(__content, testOut.toString("UTF8"));
-
- }
-}
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
index dc2e0d06d9..3110285a2a 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
@@ -29,6 +29,7 @@ import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.util.ByteArrayOutputStream2;
/* ------------------------------------------------------------ */
@@ -240,10 +241,12 @@ public abstract class AbstractCompressedStream extends ServletOutputStream
if (_encoding!=null)
{
- setHeader("Content-Encoding", _encoding);
+ String prefix=Response.getResponse(_response).isIncluding()?Response.SET_INCLUDE_HEADER_PREFIX:"";
+
+ setHeader(prefix+"Content-Encoding", _encoding);
if (_response.containsHeader("Content-Encoding"))
{
- addHeader("Vary",_vary);
+ addHeader(prefix+"Vary",_vary);
_out=_compressedOutputStream=createStream();
if (_out!=null)
{
@@ -258,9 +261,9 @@ public abstract class AbstractCompressedStream extends ServletOutputStream
{
int end = etag.length()-1;
if (etag.charAt(end)=='"')
- setHeader("ETag",etag.substring(0,end)+"--"+_encoding+'"');
+ setHeader(prefix+"ETag",etag.substring(0,end)+"--"+_encoding+'"');
else
- setHeader("ETag",etag+"--"+_encoding);
+ setHeader(prefix+"ETag",etag+"--"+_encoding);
}
return;
}
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipHandlerTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipHandlerTest.java
new file mode 100644
index 0000000000..1982a1c278
--- /dev/null
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipHandlerTest.java
@@ -0,0 +1,207 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+//
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+//
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+//
+
+package org.eclipse.jetty.servlets.gzip;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.util.zip.GZIPInputStream;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.eclipse.jetty.http.HttpTester;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.LocalConnector;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlets.gzip.GzipHandler;
+import org.eclipse.jetty.util.IO;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class GzipHandlerTest
+{
+ private static String __content =
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In quis felis nunc. "+
+ "Quisque suscipit mauris et ante auctor ornare rhoncus lacus aliquet. Pellentesque "+
+ "habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. "+
+ "Vestibulum sit amet felis augue, vel convallis dolor. Cras accumsan vehicula diam "+
+ "at faucibus. Etiam in urna turpis, sed congue mi. Morbi et lorem eros. Donec vulputate "+
+ "velit in risus suscipit lobortis. Aliquam id urna orci, nec sollicitudin ipsum. "+
+ "Cras a orci turpis. Donec suscipit vulputate cursus. Mauris nunc tellus, fermentum "+
+ "eu auctor ut, mollis at diam. Quisque porttitor ultrices metus, vitae tincidunt massa "+
+ "sollicitudin a. Vivamus porttitor libero eget purus hendrerit cursus. Integer aliquam "+
+ "consequat mauris quis luctus. Cras enim nibh, dignissim eu faucibus ac, mollis nec neque. "+
+ "Aliquam purus mauris, consectetur nec convallis lacinia, porta sed ante. Suspendisse "+
+ "et cursus magna. Donec orci enim, molestie a lobortis eu, imperdiet vitae neque.";
+
+ private static String __icontent = "BEFORE"+__content+"AFTER";
+
+ private Server _server;
+ private LocalConnector _connector;
+
+ @Before
+ public void init() throws Exception
+ {
+ _server = new Server();
+ _connector = new LocalConnector(_server);
+ _server.addConnector(_connector);
+
+ GzipHandler gzipHandler = new GzipHandler();
+
+ ServletContextHandler context = new ServletContextHandler(gzipHandler,"/ctx");
+ ServletHandler servlets = context.getServletHandler();
+
+ _server.setHandler(gzipHandler);
+ gzipHandler.setHandler(context);
+ context.setHandler(servlets);
+ servlets.addServletWithMapping(TestServlet.class,"/content");
+ servlets.addServletWithMapping(ForwardServlet.class,"/forward");
+ servlets.addServletWithMapping(IncludeServlet.class,"/include");
+
+ _server.start();
+ }
+
+ public static class TestServlet extends HttpServlet
+ {
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse response) throws ServletException, IOException
+ {
+ PrintWriter writer = response.getWriter();
+ writer.write(__content);
+ }
+ }
+
+ public static class ForwardServlet extends HttpServlet
+ {
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ getServletContext().getRequestDispatcher("/content").forward(request,response);
+ }
+ }
+
+ public static class IncludeServlet extends HttpServlet
+ {
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ response.getWriter().write("BEFORE");
+ getServletContext().getRequestDispatcher("/content").include(request,response);
+ response.getWriter().write("AFTER");
+ }
+ }
+
+ @After
+ public void destroy() throws Exception
+ {
+ _server.stop();
+ _server.join();
+ }
+
+ @Test
+ public void testGzipHandler() throws Exception
+ {
+ // generated and parsed test
+ HttpTester.Request request = HttpTester.newRequest();
+ HttpTester.Response response;
+
+ request.setMethod("GET");
+ request.setVersion("HTTP/1.0");
+ request.setHeader("Host","tester");
+ request.setHeader("accept-encoding","gzip");
+ request.setURI("/ctx/content");
+
+ response = HttpTester.parseResponse(_connector.getResponses(request.generate()));
+
+ assertTrue(response.get("Content-Encoding").equalsIgnoreCase("gzip"));
+ assertEquals(HttpServletResponse.SC_OK,response.getStatus());
+
+ InputStream testIn = new GZIPInputStream(new ByteArrayInputStream(response.getContentBytes()));
+ ByteArrayOutputStream testOut = new ByteArrayOutputStream();
+ IO.copy(testIn,testOut);
+
+ assertEquals(__content, testOut.toString("UTF8"));
+
+ }
+
+ @Test
+ public void testForwardGzipHandler() throws Exception
+ {
+ // generated and parsed test
+ HttpTester.Request request = HttpTester.newRequest();
+ HttpTester.Response response;
+
+ request.setMethod("GET");
+ request.setVersion("HTTP/1.0");
+ request.setHeader("Host","tester");
+ request.setHeader("accept-encoding","gzip");
+ request.setURI("/ctx/forward");
+
+ response = HttpTester.parseResponse(_connector.getResponses(request.generate()));
+
+ assertTrue(response.get("Content-Encoding").equalsIgnoreCase("gzip"));
+ assertEquals(HttpServletResponse.SC_OK,response.getStatus());
+
+ InputStream testIn = new GZIPInputStream(new ByteArrayInputStream(response.getContentBytes()));
+ ByteArrayOutputStream testOut = new ByteArrayOutputStream();
+ IO.copy(testIn,testOut);
+
+ assertEquals(__content, testOut.toString("UTF8"));
+ }
+
+ @Test
+ public void testIncludeGzipHandler() throws Exception
+ {
+ // generated and parsed test
+ HttpTester.Request request = HttpTester.newRequest();
+ HttpTester.Response response;
+
+ request.setMethod("GET");
+ request.setVersion("HTTP/1.0");
+ request.setHeader("Host","tester");
+ request.setHeader("accept-encoding","gzip");
+ request.setURI("/ctx/include");
+
+ response = HttpTester.parseResponse(_connector.getResponses(request.generate()));
+
+ assertTrue(response.get("Content-Encoding").equalsIgnoreCase("gzip"));
+ assertEquals(HttpServletResponse.SC_OK,response.getStatus());
+
+ InputStream testIn = new GZIPInputStream(new ByteArrayInputStream(response.getContentBytes()));
+ ByteArrayOutputStream testOut = new ByteArrayOutputStream();
+ IO.copy(testIn,testOut);
+
+ assertEquals(__icontent, testOut.toString("UTF8"));
+ }
+}
--
cgit v1.2.3
From aa85d85510cd55ec002bcd649cb9008a9ed87609 Mon Sep 17 00:00:00 2001
From: Greg Wilkins
Date: Wed, 25 Nov 2015 14:15:14 +1100
Subject: 482855 - Content-Length omitted for POST requests with empty body
An ineligant fix. Will improve in 9.3.x/9.4.x without HTTP 0.9 support.
---
.../java/org/eclipse/jetty/http/HttpGenerator.java | 25 +++++++++-----
.../jetty/http/HttpGeneratorClientTest.java | 38 +++++++++++++++++++++-
2 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
index a4e30379db..520822637b 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
@@ -23,6 +23,8 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
import org.eclipse.jetty.http.HttpTokens.EndOfContent;
import org.eclipse.jetty.util.BufferUtil;
@@ -70,8 +72,8 @@ public class HttpGenerator
private final int _send;
private final static int SEND_SERVER = 0x01;
private final static int SEND_XPOWEREDBY = 0x02;
-
-
+ private final static Set __assumedContentMethods = new HashSet<>(Arrays.asList(new String[]{HttpMethod.POST.asString(),HttpMethod.PUT.asString()}));
+
/* ------------------------------------------------------------------------------- */
public static void setJettyVersion(String serverVersion)
{
@@ -745,12 +747,17 @@ public class HttpGenerator
long content_length = _contentPrepared+BufferUtil.length(content);
// Do we need to tell the headers about it
- if ((response!=null || content_length>0 || content_type ) && !_noContent)
+ if (content_length>0)
{
header.put(HttpHeader.CONTENT_LENGTH.getBytesColonSpace());
BufferUtil.putDecLong(header, content_length);
header.put(HttpTokens.CRLF);
}
+ else if (!_noContent)
+ {
+ if (content_type || response!=null || (request!=null && __assumedContentMethods.contains(request.getMethod())))
+ header.put(CONTENT_LENGTH_0);
+ }
}
else
{
@@ -767,19 +774,21 @@ public class HttpGenerator
case CONTENT_LENGTH:
long content_length = _info.getContentLength();
- if ((response!=null || content_length>0 || content_type ) && !_noContent)
+ if (content_length>0)
{
- // known length but not actually set.
header.put(HttpHeader.CONTENT_LENGTH.getBytesColonSpace());
BufferUtil.putDecLong(header, content_length);
header.put(HttpTokens.CRLF);
}
+ else if (!_noContent)
+ {
+ if (content_type || response!=null || (request!=null && __assumedContentMethods.contains(request.getMethod())))
+ header.put(CONTENT_LENGTH_0);
+ }
break;
case NO_CONTENT:
- if (response!=null && status >= 200 && status != 204 && status != 304)
- header.put(CONTENT_LENGTH_0);
- break;
+ throw new IllegalStateException();
case EOF_CONTENT:
_persistent = request!=null;
diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
index 0fc87e1d2f..d387fa7655 100644
--- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
+++ b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
@@ -43,7 +43,7 @@ public class HttpGeneratorClientTest
}
@Test
- public void testRequestNoContent() throws Exception
+ public void testGETRequestNoContent() throws Exception
{
ByteBuffer header=BufferUtil.allocate(2048);
HttpGenerator gen = new HttpGenerator();
@@ -77,7 +77,43 @@ public class HttpGeneratorClientTest
Assert.assertEquals(0, gen.getContentPrepared());
Assert.assertThat(out, Matchers.containsString("GET /index.html HTTP/1.1"));
Assert.assertThat(out, Matchers.not(Matchers.containsString("Content-Length")));
+ }
+
+ @Test
+ public void testPOSTRequestNoContent() throws Exception
+ {
+ ByteBuffer header=BufferUtil.allocate(2048);
+ HttpGenerator gen = new HttpGenerator();
+
+ HttpGenerator.Result
+ result=gen.generateRequest(null,null,null,null, true);
+ Assert.assertEquals(HttpGenerator.Result.NEED_INFO, result);
+ Assert.assertEquals(HttpGenerator.State.START, gen.getState());
+
+ Info info = new Info("POST","/index.html");
+ info.getHttpFields().add("Host","something");
+ info.getHttpFields().add("User-Agent","test");
+ Assert.assertTrue(!gen.isChunking());
+
+ result=gen.generateRequest(info,null,null,null, true);
+ Assert.assertEquals(HttpGenerator.Result.NEED_HEADER, result);
+ Assert.assertEquals(HttpGenerator.State.START, gen.getState());
+ result=gen.generateRequest(info,header,null,null, true);
+ Assert.assertEquals(HttpGenerator.Result.FLUSH, result);
+ Assert.assertEquals(HttpGenerator.State.COMPLETING, gen.getState());
+ Assert.assertTrue(!gen.isChunking());
+ String out = BufferUtil.toString(header);
+ BufferUtil.clear(header);
+
+ result=gen.generateResponse(null,null,null,null, false);
+ Assert.assertEquals(HttpGenerator.Result.DONE, result);
+ Assert.assertEquals(HttpGenerator.State.END, gen.getState());
+ Assert.assertTrue(!gen.isChunking());
+
+ Assert.assertEquals(0, gen.getContentPrepared());
+ Assert.assertThat(out, Matchers.containsString("POST /index.html HTTP/1.1"));
+ Assert.assertThat(out, Matchers.containsString("Content-Length: 0"));
}
@Test
--
cgit v1.2.3
From 66e596511dba86225e30281cfa2e920c646b6fcc Mon Sep 17 00:00:00 2001
From: Jan Bartel
Date: Fri, 4 Dec 2015 15:58:07 +1100
Subject: 483620 Servlet annotation mapping to "/" should override
webdefault.xml mapping
---
.../jetty/annotations/WebServletAnnotation.java | 131 +++++++++-----
.../org/eclipse/jetty/annotations/ServletD.java | 31 ++++
.../jetty/annotations/TestServletAnnotations.java | 189 +++++++++++++++++++++
3 files changed, 312 insertions(+), 39 deletions(-)
create mode 100644 jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ServletD.java
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
index 9ee4352028..a42928ad41 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
@@ -19,6 +19,9 @@
package org.eclipse.jetty.annotations;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import javax.servlet.Servlet;
import javax.servlet.annotation.WebInitParam;
@@ -28,6 +31,7 @@ import javax.servlet.http.HttpServlet;
import org.eclipse.jetty.servlet.Holder;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlet.ServletMapping;
+import org.eclipse.jetty.util.ArrayUtil;
import org.eclipse.jetty.util.LazyList;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@@ -104,10 +108,11 @@ public class WebServletAnnotation extends DiscoveredAnnotation
String servletName = (annotation.name().equals("")?clazz.getName():annotation.name());
MetaData metaData = _context.getMetaData();
+ ServletMapping mapping = null; //the new mapping
//Find out if a already exists with this name
ServletHolder[] holders = _context.getServletHandler().getServlets();
- boolean isNew = true;
+
ServletHolder holder = null;
if (holders != null)
{
@@ -116,13 +121,13 @@ public class WebServletAnnotation extends DiscoveredAnnotation
if (h.getName() != null && servletName.equals(h.getName()))
{
holder = h;
- isNew = false;
break;
}
}
}
- if (isNew)
+ //handle creation/completion of a servlet
+ if (holder == null)
{
//No servlet of this name has already been defined, either by a descriptor
//or another annotation (which would be impossible).
@@ -147,11 +152,11 @@ public class WebServletAnnotation extends DiscoveredAnnotation
}
_context.getServletHandler().addServlet(holder);
- ServletMapping mapping = new ServletMapping();
+
+
+ mapping = new ServletMapping();
mapping.setServletName(holder.getName());
mapping.setPathSpecs( LazyList.toStringArray(urlPatternList));
- _context.getServletHandler().addServletMapping(mapping);
- metaData.setOrigin(servletName+".servlet.mappings",annotation,clazz);
}
else
{
@@ -174,55 +179,103 @@ public class WebServletAnnotation extends DiscoveredAnnotation
metaData.setOrigin(servletName+".servlet.init-param."+ip.name(),ip,clazz);
}
}
+
//check the url-patterns
//ServletSpec 3.0 p81 If a servlet already has url mappings from a
- //webxml or fragment descriptor the annotation is ignored. However, we want to be able to
- //replace mappings that were given in webdefault.xml
- boolean mappingsExist = false;
- boolean anyNonDefaults = false;
- ServletMapping[] allMappings = _context.getServletHandler().getServletMappings();
- if (allMappings != null)
+ //webxml or fragment descriptor the annotation is ignored.
+ //However, we want to be able to replace mappings that were given in webdefault.xml
+ List existingMappings = getServletMappingsForServlet(servletName);
+
+ //if any mappings for this servlet already set by a descriptor that is not webdefault.xml forget
+ //about processing these url mappings
+ if (existingMappings.isEmpty() || !containsNonDefaultMappings(existingMappings))
{
- for (ServletMapping m:allMappings)
- {
- if (m.getServletName() != null && servletName.equals(m.getServletName()))
- {
- mappingsExist = true;
- if (!m.isDefault())
- {
- anyNonDefaults = true;
- break;
- }
- }
- }
+ mapping = new ServletMapping();
+ mapping.setServletName(servletName);
+ mapping.setPathSpecs(LazyList.toStringArray(urlPatternList));
}
+ }
- if (anyNonDefaults)
- return; //if any mappings already set by a descriptor that is not webdefault.xml, we're done
+
+ //We also want to be able to replace mappings that were defined in webdefault.xml
+ //that were for a different servlet eg a mapping in webdefault.xml for / to the jetty
+ //default servlet should be able to be replaced by an annotation for / to a different
+ //servlet
+ if (mapping != null)
+ {
+ //url mapping was permitted by annotation processing rules
- boolean clash = false;
- if (mappingsExist)
+ //take a copy of the existing servlet mappings that we can iterate over and remove from. This is
+ //because the ServletHandler interface does not support removal of individual mappings.
+ List allMappings = ArrayUtil.asMutableList(_context.getServletHandler().getServletMappings());
+
+ //for each of the urls in the annotation, check if a mapping to same/different servlet exists
+ // if mapping exists and is from a default descriptor, it can be replaced. NOTE: we do not
+ // guard against duplicate path mapping here: that is the job of the ServletHandler
+ for (String p:urlPatternList)
{
- for (String p:urlPatternList)
+ ServletMapping existingMapping = _context.getServletHandler().getServletMapping(p);
+ if (existingMapping != null && existingMapping.isDefault())
{
- ServletMapping m = _context.getServletHandler().getServletMapping(p);
- if (m != null && !m.isDefault())
+ String[] updatedPaths = ArrayUtil.removeFromArray(existingMapping.getPathSpecs(), p);
+ //if we removed the last path from a servletmapping, delete the servletmapping
+ if (updatedPaths == null || updatedPaths.length == 0)
+ {
+ boolean success = allMappings.remove(existingMapping);
+ if (LOG.isDebugEnabled()) LOG.debug("Removed empty mapping {} from defaults descriptor success:{}",existingMapping, success);
+ }
+ else
{
- //trying to override a servlet-mapping that was added not by webdefault.xml
- clash = true;
- break;
+ existingMapping.setPathSpecs(updatedPaths);
+ if (LOG.isDebugEnabled()) LOG.debug("Removed path {} from mapping {} from defaults descriptor ", p,existingMapping);
}
}
+ _context.getMetaData().setOrigin(servletName+".servlet.mapping."+p, annotation, clazz);
}
+ allMappings.add(mapping);
+ _context.getServletHandler().setServletMappings(allMappings.toArray(new ServletMapping[allMappings.size()]));
+ }
+ }
+
+
+
+
+ /**
+ * @param name
+ * @return
+ */
+ private List getServletMappingsForServlet (String name)
+ {
+ ServletMapping[] allMappings = _context.getServletHandler().getServletMappings();
+ if (allMappings == null)
+ return Collections.emptyList();
- if (!mappingsExist || !clash)
+ List mappings = new ArrayList();
+ for (ServletMapping m:allMappings)
+ {
+ if (m.getServletName() != null && name.equals(m.getServletName()))
{
- ServletMapping m = new ServletMapping();
- m.setServletName(servletName);
- m.setPathSpecs(LazyList.toStringArray(urlPatternList));
- _context.getServletHandler().addServletMapping(m);
+ mappings.add(m);
}
}
+ return mappings;
+ }
+
+
+ /**
+ * @param mappings
+ * @return
+ */
+ private boolean containsNonDefaultMappings (List mappings)
+ {
+ if (mappings == null)
+ return false;
+ for (ServletMapping m:mappings)
+ {
+ if (!m.isDefault())
+ return true;
+ }
+ return false;
}
}
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ServletD.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ServletD.java
new file mode 100644
index 0000000000..4179e73c87
--- /dev/null
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ServletD.java
@@ -0,0 +1,31 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+//
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+//
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+//
+
+package org.eclipse.jetty.annotations;
+
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+
+
+
+@WebServlet(urlPatterns = { "/", "/bah/*" }, name="DServlet", initParams={@WebInitParam(name="x", value="y")}, loadOnStartup=1, asyncSupported=false)
+public class ServletD extends HttpServlet
+{
+
+}
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestServletAnnotations.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestServletAnnotations.java
index 58854193c7..850a22c6fe 100644
--- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestServletAnnotations.java
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestServletAnnotations.java
@@ -107,7 +107,196 @@ public class TestServletAnnotations
assertNotNull(paths);
assertEquals(2, paths.length);
}
+
+
+ @Test
+ public void testWebServletAnnotationOverrideDefault () throws Exception
+ {
+ //if the existing servlet mapping TO A DIFFERENT SERVLET IS from a default descriptor we
+ //DO allow the annotation to replace the mapping.
+
+ WebAppContext wac = new WebAppContext();
+ ServletHolder defaultServlet = new ServletHolder();
+ defaultServlet.setClassName("org.eclipse.jetty.servlet.DefaultServlet");
+ defaultServlet.setName("default");
+ wac.getServletHandler().addServlet(defaultServlet);
+
+ ServletMapping m = new ServletMapping();
+ m.setPathSpec("/");
+ m.setServletName("default");
+ m.setDefault(true); //this mapping will be from a default descriptor
+ wac.getServletHandler().addServletMapping(m);
+
+ WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
+ annotation.apply();
+
+ //test that as the original servlet mapping had only 1 pathspec, then the whole
+ //servlet mapping should be deleted as that pathspec will be remapped to the DServlet
+ ServletMapping[] resultMappings = wac.getServletHandler().getServletMappings();
+ assertNotNull(resultMappings);
+ assertEquals(1, resultMappings.length);
+ assertEquals(2, resultMappings[0].getPathSpecs().length);
+ resultMappings[0].getServletName().equals("DServlet");
+ for (String s:resultMappings[0].getPathSpecs())
+ {
+ assertTrue (s.equals("/") || s.equals("/bah/*"));
+ }
+ }
+
+
+
+ @Test
+ public void testWebServletAnnotationReplaceDefault () throws Exception
+ {
+ //if the existing servlet mapping TO A DIFFERENT SERVLET IS from a default descriptor we
+ //DO allow the annotation to replace the mapping.
+ WebAppContext wac = new WebAppContext();
+ ServletHolder defaultServlet = new ServletHolder();
+ defaultServlet.setClassName("org.eclipse.jetty.servlet.DefaultServlet");
+ defaultServlet.setName("default");
+ wac.getServletHandler().addServlet(defaultServlet);
+
+ ServletMapping m = new ServletMapping();
+ m.setPathSpec("/");
+ m.setServletName("default");
+ m.setDefault(true); //this mapping will be from a default descriptor
+ wac.getServletHandler().addServletMapping(m);
+
+ ServletMapping m2 = new ServletMapping();
+ m2.setPathSpec("/other");
+ m2.setServletName("default");
+ m2.setDefault(true); //this mapping will be from a default descriptor
+ wac.getServletHandler().addServletMapping(m2);
+
+ WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
+ annotation.apply();
+
+ //test that only the mapping for "/" was removed from the mappings to the default servlet
+ ServletMapping[] resultMappings = wac.getServletHandler().getServletMappings();
+ assertNotNull(resultMappings);
+ assertEquals(2, resultMappings.length);
+ for (ServletMapping r:resultMappings)
+ {
+ if (r.getServletName().equals("default"))
+ {
+ assertEquals(1,r.getPathSpecs().length);
+ assertEquals("/other", r.getPathSpecs()[0]);
+ }
+ else if (r.getServletName().equals("DServlet"))
+ {
+ assertEquals(2,r.getPathSpecs().length);
+ for (String p:r.getPathSpecs())
+ {
+ if (!p.equals("/") && !p.equals("/bah/*"))
+ fail("Unexpected path");
+ }
+ }
+ else
+ fail("Unexpected servlet mapping");
+ }
+
+ }
+
+
+ @Test
+ public void testWebServletAnnotationNotOverride () throws Exception
+ {
+ //if the existing servlet mapping TO A DIFFERENT SERVLET IS NOT from a default descriptor we
+ //DO NOT allow the annotation to replace the mapping
+ WebAppContext wac = new WebAppContext();
+ ServletHolder servlet = new ServletHolder();
+ servlet.setClassName("org.eclipse.jetty.servlet.FooServlet");
+ servlet.setName("foo");
+ wac.getServletHandler().addServlet(servlet);
+ ServletMapping m = new ServletMapping();
+ m.setPathSpec("/");
+ m.setServletName("foo");
+ wac.getServletHandler().addServletMapping(m);
+
+ WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
+ annotation.apply();
+
+ ServletMapping[] resultMappings = wac.getServletHandler().getServletMappings();
+ assertEquals(2, resultMappings.length);
+ for (ServletMapping r:resultMappings)
+ {
+ if (r.getServletName().equals("DServlet"))
+ {
+ assertEquals(2, r.getPathSpecs().length);
+ }
+ else if (r.getServletName().equals("foo"))
+ {
+ assertEquals(1, r.getPathSpecs().length);
+ }
+ else
+ fail("Unexpected servlet name");
+ }
+ }
+
+ @Test
+ public void testWebServletAnnotationIgnore () throws Exception
+ {
+ //an existing servlet OF THE SAME NAME has even 1 non-default mapping we can't use
+ //any of the url mappings in the annotation
+ WebAppContext wac = new WebAppContext();
+ ServletHolder servlet = new ServletHolder();
+ servlet.setClassName("org.eclipse.jetty.servlet.OtherDServlet");
+ servlet.setName("DServlet");
+ wac.getServletHandler().addServlet(servlet);
+
+ ServletMapping m = new ServletMapping();
+ m.setPathSpec("/default");
+ m.setDefault(true);
+ m.setServletName("DServlet");
+ wac.getServletHandler().addServletMapping(m);
+
+ ServletMapping m2 = new ServletMapping();
+ m2.setPathSpec("/other");
+ m2.setServletName("DServlet");
+ wac.getServletHandler().addServletMapping(m2);
+
+ WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
+ annotation.apply();
+ ServletMapping[] resultMappings = wac.getServletHandler().getServletMappings();
+ assertEquals(2, resultMappings.length);
+
+ for (ServletMapping r:resultMappings)
+ {
+ assertEquals(1, r.getPathSpecs().length);
+ if (!r.getPathSpecs()[0].equals("/default") && !r.getPathSpecs()[0].equals("/other"))
+ fail("Unexpected path in mapping");
+ }
+
+ }
+
+ @Test
+ public void testWebServletAnnotationNoMappings () throws Exception
+ {
+ //an existing servlet OF THE SAME NAME has no mappings, therefore all mappings in the annotation
+ //should be accepted
+ WebAppContext wac = new WebAppContext();
+ ServletHolder servlet = new ServletHolder();
+ servlet.setName("foo");
+ wac.getServletHandler().addServlet(servlet);
+
+
+ WebServletAnnotation annotation = new WebServletAnnotation(wac, "org.eclipse.jetty.annotations.ServletD", null);
+ annotation.apply();
+
+ ServletMapping[] resultMappings = wac.getServletHandler().getServletMappings();
+ assertEquals(1, resultMappings.length);
+ assertEquals(2, resultMappings[0].getPathSpecs().length);
+ for (String s:resultMappings[0].getPathSpecs())
+ {
+ if (!s.equals("/") && !s.equals("/bah/*"))
+ fail("Unexpected path mapping");
+ }
+ }
+
+
+
+ @Test
public void testDeclareRoles ()
throws Exception
{
--
cgit v1.2.3
From e6f23a692ec3a7472965100854a7ade69733c71c Mon Sep 17 00:00:00 2001
From: Simone Bordet
Date: Tue, 8 Dec 2015 12:02:57 +0100
Subject: 482270 - Expose upgrade request locales.
Exposed as a user property.
---
.../eclipse/jetty/websocket/jsr356/server/JsrCreator.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java
index 1c43be3895..b261f61dd8 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java
@@ -20,7 +20,9 @@ package org.eclipse.jetty.websocket.jsr356.server;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
import javax.websocket.Extension;
import javax.websocket.Extension.Parameter;
@@ -43,6 +45,7 @@ public class JsrCreator implements WebSocketCreator
{
public static final String PROP_REMOTE_ADDRESS = "javax.websocket.endpoint.remoteAddress";
public static final String PROP_LOCAL_ADDRESS = "javax.websocket.endpoint.localAddress";
+ public static final String PROP_LOCALES = "javax.websocket.upgrade.locales";
private static final Logger LOG = Log.getLogger(JsrCreator.class);
private final ServerEndpointMetadata metadata;
private final ExtensionFactory extensionFactory;
@@ -61,17 +64,19 @@ public class JsrCreator implements WebSocketCreator
// Get raw config, as defined when the endpoint was added to the container
ServerEndpointConfig config = metadata.getConfig();
-
+
// Establish a copy of the config, so that the UserProperties are unique
// per upgrade request.
config = new BasicServerEndpointConfig(config);
-
+
// Bug 444617 - Expose localAddress and remoteAddress for jsr modify handshake to use
// This is being implemented as an optional set of userProperties so that
// it is not JSR api breaking. A few users on #jetty and a few from cometd
// have asked for access to this information.
- config.getUserProperties().put(PROP_LOCAL_ADDRESS,req.getLocalSocketAddress());
- config.getUserProperties().put(PROP_REMOTE_ADDRESS,req.getRemoteSocketAddress());
+ Map userProperties = config.getUserProperties();
+ userProperties.put(PROP_LOCAL_ADDRESS,req.getLocalSocketAddress());
+ userProperties.put(PROP_REMOTE_ADDRESS,req.getRemoteSocketAddress());
+ userProperties.put(PROP_LOCALES,Collections.list(req.getLocales()));
// Get Configurator from config object (not guaranteed to be unique per endpoint upgrade)
ServerEndpointConfig.Configurator configurator = config.getConfigurator();
--
cgit v1.2.3