From b119bdfa247beb0dcc45cbd2867a6985dfeada9c Mon Sep 17 00:00:00 2001 From: Thomas Becker Date: Fri, 21 Jun 2013 14:06:09 +0200 Subject: [PATCH 01/29] fix typo in javadoc --- .../jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java index 037cb0c9024..ca71cb3fa4e 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java @@ -98,7 +98,7 @@ public class HTTPSPDYServerConnectionFactory extends SPDYServerConnectionFactory Fields headers = synInfo.getHeaders(); // According to SPDY/3 spec section 3.2.1 user-agents MUST support gzip compression. Firefox omits the - // accep-encoding header as it is redundant to negotiate gzip compression support with the server, + // accept-encoding header as it is redundant to negotiate gzip compression support with the server, // if clients have to accept it. // So we inject the accept-encoding header here, even if not set by the client. This will enforce SPDY // clients to follow the spec and enable gzip compression if GzipFilter or the like is enabled. From 918632d40851ca939ba0ec502e2cd95a54f1dd1e Mon Sep 17 00:00:00 2001 From: Thomas Becker Date: Fri, 21 Jun 2013 14:44:58 +0200 Subject: [PATCH 02/29] 411340 SpdyConnection make executeOnFillable configurable and default to true --- .../src/test/config/etc/jetty-spdy.xml | 57 ++-- .../eclipse/jetty/spdy/client/SPDYClient.java | 11 + .../client/SPDYClientConnectionFactory.java | 7 +- .../jetty/spdy/client/SPDYConnection.java | 11 +- .../src/main/config/etc/jetty-spdy.xml | 250 ++++++++++-------- .../server/SPDYServerConnectionFactory.java | 23 +- 6 files changed, 208 insertions(+), 151 deletions(-) diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml index d3244b67c0b..8c06a2cc258 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml @@ -54,32 +54,32 @@ - - + + - - - 5000 - 32 + + + 5000 + 32 @@ -121,6 +121,10 @@ + + + 65536 + @@ -131,6 +135,9 @@ + + + 65536 diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java index e2a0cba22ad..c4360a2c121 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java @@ -60,6 +60,7 @@ public class SPDYClient private volatile SocketAddress bindAddress; private volatile long idleTimeout = -1; private volatile int initialWindowSize; + private volatile boolean executeOnFillable; protected SPDYClient(short version, Factory factory) { @@ -125,6 +126,16 @@ public class SPDYClient this.initialWindowSize = initialWindowSize; } + public boolean isExecuteOnFillable() + { + return executeOnFillable; + } + + public void setExecuteOnFillable(boolean executeOnFillable) + { + this.executeOnFillable = executeOnFillable; + } + protected String selectProtocol(List serverProtocols) { String protocol = "spdy/" + version; diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClientConnectionFactory.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClientConnectionFactory.java index 536f88ce3ff..18244e87a87 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClientConnectionFactory.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClientConnectionFactory.java @@ -45,7 +45,7 @@ public class SPDYClientConnectionFactory Parser parser = new Parser(compressionFactory.newDecompressor()); Generator generator = new Generator(bufferPool, compressionFactory.newCompressor()); - SPDYConnection connection = new ClientSPDYConnection(endPoint, bufferPool, parser, factory); + SPDYConnection connection = new ClientSPDYConnection(endPoint, bufferPool, parser, factory, client.isExecuteOnFillable()); FlowControlStrategy flowControlStrategy = client.newFlowControlStrategy(); @@ -66,9 +66,10 @@ public class SPDYClientConnectionFactory { private final Factory factory; - public ClientSPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Factory factory) + public ClientSPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Factory factory, + boolean executeOnFillable) { - super(endPoint, bufferPool, parser, factory.getExecutor()); + super(endPoint, bufferPool, parser, factory.getExecutor(), executeOnFillable); this.factory = factory; } diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java index 33ed4c66c4b..b057b8a9232 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java @@ -44,20 +44,21 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id private volatile ISession session; private volatile boolean idle = false; - - public SPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Executor executor) + public SPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Executor executor, + boolean executeOnFillable) { - this(endPoint, bufferPool, parser, executor, 8192); + this(endPoint, bufferPool, parser, executor, executeOnFillable, 8192); } - public SPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Executor executor, int bufferSize) + public SPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Executor executor, + boolean executeOnFillable, int bufferSize) { // Since SPDY is multiplexed, onFillable() must never block // while calling application code. In fact, onFillable() // always dispatches to a new thread when calling application // code, so here we can safely pass false as last parameter, // and avoid to dispatch to onFillable(). - super(endPoint, executor, !EXECUTE_ONFILLABLE); + super(endPoint, executor, executeOnFillable); this.bufferPool = bufferPool; this.parser = parser; onIdle(true); diff --git a/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml b/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml index b5d0a4c2fe5..973ab9ffb45 100644 --- a/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml +++ b/jetty-spdy/spdy-http-server/src/main/config/etc/jetty-spdy.xml @@ -8,128 +8,150 @@ - - - - - - - - - - - - - - + + - - - 5000 - 32 - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 5000 + 32 + - - - - npn - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - spdy/3 - spdy/2 - http/1.1 - - http/1.1 - - + + + + npn + + + + + - - - - 3 - - - - - + + + + + + spdy/3 + spdy/2 + http/1.1 + + + http/1.1 + + - - - - 2 - - - + + + + 3 + + + + + + 65536 + + + + - - - - - - - + + + + 2 + + + + + + 65536 + + + + + + + + + + + + + + + + + + + + + 30000 + - - - - 30000 - - - + diff --git a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnectionFactory.java b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnectionFactory.java index 25d011f9746..5e6815b950e 100644 --- a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnectionFactory.java +++ b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/SPDYServerConnectionFactory.java @@ -69,6 +69,7 @@ public class SPDYServerConnectionFactory extends AbstractConnectionFactory private final short version; private final ServerSessionFrameListener listener; private int initialWindowSize; + private boolean executeOnFillable = true; private final Queue sessions = new ConcurrentLinkedQueue<>(); public SPDYServerConnectionFactory(int version) @@ -103,14 +104,15 @@ public class SPDYServerConnectionFactory extends AbstractConnectionFactory Generator generator = new Generator(connector.getByteBufferPool(), compressionFactory.newCompressor()); ServerSessionFrameListener listener = provideServerSessionFrameListener(connector, endPoint); - SPDYConnection connection = new ServerSPDYConnection(connector, endPoint, parser, listener, getInputBufferSize()); + SPDYConnection connection = new ServerSPDYConnection(connector, endPoint, parser, listener, + executeOnFillable, getInputBufferSize()); FlowControlStrategy flowControlStrategy = newFlowControlStrategy(version); StandardSession session = new StandardSession(getVersion(), connector.getByteBufferPool(), connector.getExecutor(), connector.getScheduler(), connection, endPoint, connection, 2, listener, generator, flowControlStrategy); - session.setWindowSize(getInitialWindowSize()); + session.setWindowSize(initialWindowSize); parser.addListener(session); connection.setSession(session); @@ -140,6 +142,17 @@ public class SPDYServerConnectionFactory extends AbstractConnectionFactory this.initialWindowSize = initialWindowSize; } + @ManagedAttribute("Execute onFillable") + public boolean isExecuteOnFillable() + { + return executeOnFillable; + } + + public void setExecuteOnFillable(boolean executeOnFillable) + { + this.executeOnFillable = executeOnFillable; + } + protected boolean sessionOpened(Session session) { // Add sessions only if the connector is not stopping @@ -177,9 +190,11 @@ public class SPDYServerConnectionFactory extends AbstractConnectionFactory private final ServerSessionFrameListener listener; private final AtomicBoolean connected = new AtomicBoolean(); - private ServerSPDYConnection(Connector connector, EndPoint endPoint, Parser parser, ServerSessionFrameListener listener, int bufferSize) + private ServerSPDYConnection(Connector connector, EndPoint endPoint, Parser parser, + ServerSessionFrameListener listener, boolean executeOnFillable, int bufferSize) { - super(endPoint, connector.getByteBufferPool(), parser, connector.getExecutor(), bufferSize); + super(endPoint, connector.getByteBufferPool(), parser, connector.getExecutor(), + executeOnFillable, bufferSize); this.listener = listener; } From 4ba9385ebc744ae1de55d650e3a983c2058d93bb Mon Sep 17 00:00:00 2001 From: Thomas Becker Date: Fri, 21 Jun 2013 15:28:33 +0200 Subject: [PATCH 03/29] 411340 add comment why executeOnFillable defaults to true --- .../eclipse/jetty/spdy/client/SPDYConnection.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java index b057b8a9232..b77b9d6e548 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java @@ -53,11 +53,16 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id public SPDYConnection(EndPoint endPoint, ByteBufferPool bufferPool, Parser parser, Executor executor, boolean executeOnFillable, int bufferSize) { - // Since SPDY is multiplexed, onFillable() must never block - // while calling application code. In fact, onFillable() - // always dispatches to a new thread when calling application - // code, so here we can safely pass false as last parameter, - // and avoid to dispatch to onFillable(). + // Since SPDY is multiplexed, onFillable() must never block while calling application code. In fact, + // the SPDY code always dispatches to a new thread when calling application code, + // so here we can safely pass false as last parameter, and avoid to dispatch to onFillable(). The IO + // operation (read, parse, etc.) will not block and will be fast in almost all cases. Big uploads to a server + // however might block the Selector thread for a long time and therefore block other connections to be read. + // This might be a good reason to set executeOnFillable to true. + // + // Due to a jvm bug we've had a Selector thread being stuck at + // sun.nio.ch.FileDispatcherImpl.preClose0(Native Method). That's why we now default executeOnFillable to + // true even if for most use cases it is faster to not dispatch the IO events. super(endPoint, executor, executeOnFillable); this.bufferPool = bufferPool; this.parser = parser; From b6df8a497830bdd3df3613f2cf138440d842ea33 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 21 Jun 2013 09:15:32 -0500 Subject: [PATCH 04/29] set for release --- VERSION.txt | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 2 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 75754629646..7c5046235d3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,136 @@ -jetty-9.0.4-SNAPSHOT +jetty-9.0.4.v20130621 21 June 2013 + + 396706 CGI support parameters + + 397051 Make JDBCLoginService data members protected to facilitate + subclassing + + 397193 MongoSessionManager refresh updates last access time + + 398467 Servlet 3.1 Non Blocking IO + + 400503 WebSocket - squelch legitimate Exceptions during testing to avoid + false positives + + 401027 javadoc JMX annotations + + 404508 enable overlay deployer + + 405188 HTTP 1.0 with GET returns internal IP address. + + 405313 Websocket client SSL hostname verification is broken, always defaults + to raw IP as String + + 406759 supressed stacktrace in ReferrerPushStrategyTest + + 406923 Accept CRLF or LF but not CR as line termination + + 407246 Test harness checked results in callbacks ignored. + + 407325 Test Failure: + org.eclipse.jetty.servlets.EventSourceServletTest.testEncoding + + 407326 Test Failure: + org.eclipse.jetty.client.HttpClientStreamTest.testInputStreamResponseListenerFailedBeforeResponse[0]. + + 407342 ReloadedSessionMissingClassTest uses class compiled with jdk7 + + 407386 Cookies not copied in ServletWebSocketRequest + + 407469 Method parameters for @OnWebSocketError should support Throwable + + 407470 Javadoc for @OnWebSocketFrame incorrectly references WebSocketFrame + object + + 407491 Better handle empty Accept-Language + + 407614 added excludedMimeTypes to gzipFilter + + 407812 jetty-maven-plugin can not handle whitespaces in equivalent of + WEB-INF/classes paths + + 407931 Add toggle for failing on servlet availability + + 407976 JDBCSessionIdManager potentially leaves server in bad state after + startup + + 408077 HashSessionManager leaves file handles open after being stopped + + 408117 isAsyncStarted is false on redispatch + + 408118 NullPointerException when parsing request cookies + + 408167 JDBCSessionManager don't mark session as dirty if same attribute + value set + + 408281 Inconsistent start/stop handling in ContainerLifeCycle + + 408446 Multipart parsing issue with boundry and charset in ContentType + header + + 408529 Etags set in 304 response + + 408600 set correct jetty.url in all pom files + + 408642 setContentType from addHeader + + 408662 In pax-web servlet services requests even if init() has not finished + running + + 408709 refactor test-webapp's chat application. Now there's only a single + request for user login and initial chat message. + + 408720 NPE in AsyncContext.getRequest() + + 408723 Jetty Maven plugin reload ignores web.xml listeners + + 408768 JSTL jars not scanned by jetty-ant + + 408771 Problem with ShutdownMonitor for jetty-ant + + 408782 Transparent Proxy - rewrite URL is ignoring query strings. + + 408806 getParameter returns null on Multipart request if called before + request.getPart()/getParts() + + 408904 Enhance CommandlineBuilder to not escape strings inside single quotes + + 408909 GzipFilter setting of headers when reset and/or not compressed + + 408910 META-INF/jetty-webapp-context.xml file should be able to refer to + bundle-relative locations + + 408923 Need to be able to configure the ThreadPool for the default jetty + server in osgi + + 408945 XML Args ignored without DTD + + 409012 added reference to example rewrite rules + + 409133 Empty causes StackOverflowError + + 409228 Set jetty.home property so config files work even if deployed inside + a bundle + + 409403 fix IllegalStateException when SPDY is used and the response is + written through BufferUtil.writeTo byte by byte + + 409436 NPE on context restart using dynamic servlet registration + + 409441 jetty.xml threadpool arg injection + + 409449 Ensure servlets, filters and listeners added via dynamic + registration, annotations or descriptors are cleaned on context restarts + + 409545 Change HttpChannel contract + + 409556 Resource files not closed + + 409598 spdy: Fix NPE when a broken client tried to create duplicate stream + IDs + + 409684 Ids and properties not set for execution of jetty xml config files + with mvn plugin + + 409796 fix intermittent test issue in + ReferrerPushStrategy.testResourceOrder. Happened when the client got closed + before the server finished sending all data frames. Client waits now until + all data is received. + + 409801 Jetty should allow webdefault to be specified using a relative + location when running in OSGi + + 409842 Suspended request completed by a request thread does not set read + interest. + + 409953 return buffer.slice() instead of buffer.asReadOnlyBuffer() in + ResourceCache to avoid using inefficent path in BufferUtil.writeTo + + 409978 Websocket shouldn't create HttpSession if not present + + 410083 Jetty clients submits incomplete URL to proxy. + + 410098 inject accept-encoding header for all http requests through SPDY as + SPDY clients MUST support spdy. Also remove two new tests that have been to + implementation agnostic and not needed anymore due to recent code changes + + 410175 WebSocketSession#isSecure() doesn't return true for SSL session on + the server side + + 410246 HttpClient with proxy does not tunnel HTTPS requests. + + 410337 throw EofException instead of EOFException in HttpOutput.write() if + HttpOutpyt is closed + + 410341 suppress stacktraces that happen during test setup shutdown after + successful test run + + 410370 WebSocketCreator.createWebSocket() should use servlet specific + parameters + + 410372 Make SSL client certificate information available to server + websockets + + 410386 WebSocket Session.getUpgradeRequest().getRequestURI() returns bad URI + on server side + + 410405 Avoid NPE for requestDispatcher(../) + + 410469 UpgradeRequest is sent twice when using SSL, one fails warning about + WritePendingException + + 410522 jetty start broken for command line options + + 410537 Exceptions during @OnWebSocketConnect not reported to + @OnWebSocketError + + 410559 Removed FillInterest race + + 410630 MongoSessionManager conflicting session update op + + 410693 ServletContextHandler.setHandler does not relink handlers - check for + null + + 410750 NoSQLSessions: implement session context data persistence across + server restarts + + 410799 errors while creating push streams in HttpTransportOverSPDY are now + logged to debug instead of warn + + 410893 async support defaults to false for spec created servlets and filters + + 410911 Continuation isExpired handling. + + 410995 Avoid reverse DNS lookups when creating SSLEngines. + + 411061 fix cookie handling in spdy. If two different HTTP headers with the + same name are set, they should be translated to a single multiheader value + according to: + http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3#TOC-2.6.10-Name-Value-Header-Block. + That applies for Set-Cookie headers for example. Before this changed + duplicate header names have overwritten the previous one + + 411135 HttpClient may send proxied https requests to the proxy instead of + the target server. + + 411340 add comment why executeOnFillable defaults to true -jetty-9.0.3.v20130506 06 May 2013 +jetty-9.0.3.v20130506 - 06 May 2013 + 404010 fix cast exception in mongodb session manager + 404911 WebSocketCloseTest fails spuriously + 405281 allow filemappedbuffers to not be used From c1082ad4d4dd04e0c699be7b904fdfe9bd0483df Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 21 Jun 2013 09:49:15 -0500 Subject: [PATCH 05/29] [maven-release-plugin] prepare release jetty-9.0.4.v20130621 --- 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-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/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-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/jetty-osgi-npn/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-overlay-deployer/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/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-client/pom.xml | 2 +- jetty-spdy/spdy-core/pom.xml | 2 +- jetty-spdy/spdy-example-webapp/pom.xml | 2 +- jetty-spdy/spdy-http-server/pom.xml | 5 ++--- 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/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-loginservice/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-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-servlet-spec/test-container-initializer/pom.xml | 2 +- .../test-webapps/test-servlet-spec/test-spec-webapp/pom.xml | 2 +- .../test-webapps/test-servlet-spec/test-web-fragment/pom.xml | 2 +- tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +- 77 files changed, 78 insertions(+), 79 deletions(-) diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index a19d752f3ac..72cbabe8f2d 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 4a02ff92120..e02cd57f252 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 org.eclipse.jetty.example-async-rest diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index e88cde949b8..d446538d819 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130621 ../pom.xml 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 0f30afe56f3..04a04aed828 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130621 ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 1bda41bc19e..829abfe0881 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 ../pom.xml org.eclipse.jetty.examples diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 13e2194554a..ec86dab301a 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 01fe3ea3fb2..89eb1722894 100755 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-ant diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 4ba11e2cf74..dcdd42aea50 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index f71dc603ea5..c9e53889442 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 4ea462a633d..e23fcd0919a 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 5aff528e629..b1f37062379 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index bbf3d08ab63..7f04737c886 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index a9a4ed7853a..3225a7d4d53 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 318f67e40bf..4190740622f 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 71728a363cd..2a358cfbfb7 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index f20145c4ef5..40d23f70f86 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 39b659790d0..46ff7bdc1de 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-jndi diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 83eda5dcbf9..8bc32316a60 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-jsp diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index ef651cf7d8f..8adaca9fc05 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index dd920008467..26637511628 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-maven-plugin diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index e8bcf615ab2..7b2a9a743d1 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-monitor diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 54850bce947..fb523160076 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-nosql diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 29a346103a7..8718440b9ea 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 b853eb80c9e..b9dd53caab4 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.0.4-SNAPSHOT + 9.0.4.v20130621 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index d5ba5960526..efdcdc9212c 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 df9b6c586ae..47ec6e237bf 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-httpservice diff --git a/jetty-osgi/jetty-osgi-npn/pom.xml b/jetty-osgi/jetty-osgi-npn/pom.xml index a625bcc468a..1f6cd09c76e 100644 --- a/jetty-osgi/jetty-osgi-npn/pom.xml +++ b/jetty-osgi/jetty-osgi-npn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-osgi-npn diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index f9a021d8a3e..82f55138fe1 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 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 86c24d4b559..03d9663e427 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 14ad31c49d6..6ed410e7fb9 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.0.4-SNAPSHOT + 9.0.4.v20130621 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index e4cd558238b..1eceb5660d9 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.0.4-SNAPSHOT + 9.0.4.v20130621 ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 53071fecb1a..c454034efea 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index aac004a02fa..d811010e533 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 490c4dc28a1..079567af1c7 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-proxy diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 03ad237907e..1cbe94ffcec 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 0883fd88398..b50dc89eb3a 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 org.eclipse.jetty diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index d551ab44a55..62777833529 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 2f24762a9f2..317121a06fb 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index d503d2fac73..79a52214a65 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 9d5de75af90..f8ba04b2ec2 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-servlets diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index 0d94bf0a7a5..8ec39860784 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml index a2ec7b0e583..90ad1c8df61 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index 858427eb2a7..5c76724533b 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml index 924536d62b3..51eac1bd228 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 spdy-example-webapp diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml index efd7880b41f..80765f54458 100644 --- a/jetty-spdy/spdy-http-server/pom.xml +++ b/jetty-spdy/spdy-http-server/pom.xml @@ -1,10 +1,9 @@ - + org.eclipse.jetty.spdy spdy-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 spdy-http-server diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml index 63175046b0c..474ec0c5c59 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 51a53ac38f3..43b2d92967b 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index a1e501d5386..33f736bd572 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-start diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index b6f45427853..8171acd943a 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index a201f0aaa68..b0f3a025ee6 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index c2975ebd000..736cc1a7490 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 26c02b999b6..95239fe16f0 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 3980f625872..232c80e2fa3 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index f8822d88b09..caf7314b339 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index 5d95b151e50..0bd66046996 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index a2551bdf1e5..73a3e443225 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 93dc564985f..876ca83b6ac 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.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index e0fb01f9245..f6589e559be 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index f40e7e76c0c..e15957c5b90 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 20 jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 Jetty :: Project http://www.eclipse.org/jetty pom diff --git a/tests/pom.xml b/tests/pom.xml index 920b69b5afd..75a7e44bf61 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130621 ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index 936f4a1abf1..373e0cd1159 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130621 ../pom.xml 4.0.0 diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 7ba45e0b92e..e6df5ca941a 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130621 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 9330be8282d..58fcf1c30b6 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130621 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 a78216c8b49..86958663b14 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 91c24996d55..1bfb1c83174 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.0.4-SNAPSHOT + 9.0.4.v20130621 test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index d72d95fb821..69a41bc9def 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.0.4-SNAPSHOT + 9.0.4.v20130621 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index cea8290cd16..599a64c444d 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130621 ../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 5b7b6d95438..8f1ac007364 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 f13b5f27720..8b9bc3659c7 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.0.4-SNAPSHOT + 9.0.4.v20130621 ../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 08dbf69462d..7d796be43e9 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 6aa8b94d365..990f6df3888 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 cd27f69a0c5..f3d95b22fe5 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.0.4-SNAPSHOT + 9.0.4.v20130621 ../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 dae132153a3..7492011e5d3 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 8146e3e89ef..08949dcb2b9 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 0859a289198..148ff3f88af 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 bf6f03bc7a4..755a8dea7ad 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.0.4-SNAPSHOT + 9.0.4.v20130621 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 2243dac04b5..a4eda2b565c 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.0.4-SNAPSHOT + 9.0.4.v20130621 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 57bfda2a0829fca0773fbcadcacd2795a094cc09 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 21 Jun 2013 09:49:25 -0500 Subject: [PATCH 06/29] [maven-release-plugin] prepare for next development iteration --- 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-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/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-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/jetty-osgi-npn/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-overlay-deployer/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/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-client/pom.xml | 2 +- jetty-spdy/spdy-core/pom.xml | 2 +- jetty-spdy/spdy-example-webapp/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/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-loginservice/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-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-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 +- 77 files changed, 77 insertions(+), 77 deletions(-) diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index 72cbabe8f2d..9a6c6e8acb3 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.0.4.v20130621 + 9.0.5-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 e02cd57f252..3e3d48dc6bb 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.0.4.v20130621 + 9.0.5-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 d446538d819..25f20fcfda3 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.4.v20130621 + 9.0.5-SNAPSHOT ../pom.xml 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 04a04aed828..80d165662a4 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.4.v20130621 + 9.0.5-SNAPSHOT ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 829abfe0881..e311e4d9465 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT ../pom.xml org.eclipse.jetty.examples diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index ec86dab301a..122641b2c6a 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 89eb1722894..d75604169f1 100755 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-ant diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index dcdd42aea50..cfa10eb3ad2 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index c9e53889442..047c8f293bc 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index e23fcd0919a..fc174140bbf 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index b1f37062379..eebc1d395b4 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 7f04737c886..e8de81ef116 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 3225a7d4d53..3da554a4c9a 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 4190740622f..d84da94c271 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 2a358cfbfb7..414e03b51ef 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 40d23f70f86..d6949288ce2 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 46ff7bdc1de..3eb271a8bb5 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 8bc32316a60..d6ab59448a0 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-jsp diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 8adaca9fc05..37d267d4c14 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 26637511628..55a68c0fe93 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-maven-plugin diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index 7b2a9a743d1..54c88cb3a98 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-monitor diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index fb523160076..720668e25ee 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 8718440b9ea..ef649226ea6 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.0.4.v20130621 + 9.0.5-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 b9dd53caab4..60eb08b5006 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.0.4.v20130621 + 9.0.5-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 efdcdc9212c..be8b6f49408 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.0.4.v20130621 + 9.0.5-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 47ec6e237bf..e7fcc7528f9 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-httpservice diff --git a/jetty-osgi/jetty-osgi-npn/pom.xml b/jetty-osgi/jetty-osgi-npn/pom.xml index 1f6cd09c76e..de04a5c5f6f 100644 --- a/jetty-osgi/jetty-osgi-npn/pom.xml +++ b/jetty-osgi/jetty-osgi-npn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-osgi-npn diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 82f55138fe1..29826d2fc45 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-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 03d9663e427..b180cb7df25 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.0.4.v20130621 + 9.0.5-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 6ed410e7fb9..31a2c39b6ce 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.0.4.v20130621 + 9.0.5-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 1eceb5660d9..9120a43a3f9 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.0.4.v20130621 + 9.0.5-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index c454034efea..03abbaa3cf1 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index d811010e533..e7e33721f16 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 079567af1c7..f2a1d005aed 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-proxy diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 1cbe94ffcec..daa1fe17e1d 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index b50dc89eb3a..1c4fe9d3114 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 62777833529..7a4643e7f02 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 317121a06fb..70f2af62a88 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 79a52214a65..9a6785acd6f 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index f8ba04b2ec2..14c1ec2928e 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index 8ec39860784..d351bed6ceb 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml index 90ad1c8df61..7e4923454f8 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index 5c76724533b..60df8ab8e84 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml index 51eac1bd228..d2df0aaa9d3 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 spdy-example-webapp diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml index 80765f54458..af9bb4d2509 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 spdy-http-server diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml index 474ec0c5c59..699a2e1bf7f 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 43b2d92967b..0af3ab1edaf 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 33f736bd572..df3606bf8db 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 8171acd943a..9a7f15f1953 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index b0f3a025ee6..c0cecebdd7d 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 736cc1a7490..4428c65988a 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 95239fe16f0..07e52e698b9 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 232c80e2fa3..e24e073f012 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index caf7314b339..8036f8ef5a4 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index 0bd66046996..cf0ca81a4d1 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index 73a3e443225..a2bae1ec042 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 876ca83b6ac..a8e1d7ebb38 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.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index f6589e559be..873e2721ef9 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index e15957c5b90..aebaa96269e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 20 jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT Jetty :: Project http://www.eclipse.org/jetty pom diff --git a/tests/pom.xml b/tests/pom.xml index 75a7e44bf61..ecf5c4e0c8f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130621 + 9.0.5-SNAPSHOT ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index 373e0cd1159..36dfbf80626 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4.v20130621 + 9.0.5-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index e6df5ca941a..cc472957b70 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4.v20130621 + 9.0.5-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 58fcf1c30b6..aedc181b052 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4.v20130621 + 9.0.5-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 86958663b14..e0fce942e14 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.0.4.v20130621 + 9.0.5-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 1bfb1c83174..0513c4e821b 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.0.4.v20130621 + 9.0.5-SNAPSHOT test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 69a41bc9def..f0d4a03fd80 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.0.4.v20130621 + 9.0.5-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 599a64c444d..fc232ded383 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4.v20130621 + 9.0.5-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 8f1ac007364..1836e487eee 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.0.4.v20130621 + 9.0.5-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 8b9bc3659c7..477a5f703e1 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.0.4.v20130621 + 9.0.5-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 7d796be43e9..2f5c2f0728c 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.0.4.v20130621 + 9.0.5-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 990f6df3888..f07097dbe59 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.0.4.v20130621 + 9.0.5-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 f3d95b22fe5..2b71367f759 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.0.4.v20130621 + 9.0.5-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 7492011e5d3..031f2fce86a 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.0.4.v20130621 + 9.0.5-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 08949dcb2b9..54da2e83181 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.0.4.v20130621 + 9.0.5-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 148ff3f88af..44344dd4c68 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.0.4.v20130621 + 9.0.5-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 755a8dea7ad..abef5923f88 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.0.4.v20130621 + 9.0.5-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 a4eda2b565c..433b97a7001 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.0.4.v20130621 + 9.0.5-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 4db892d6b39a05a3bdaa8ca84f02043410ae9cd7 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 21 Jun 2013 11:28:25 -0500 Subject: [PATCH 07/29] update links on root context of distro --- .../src/main/resources/webapps.demo/ROOT/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jetty-distribution/src/main/resources/webapps.demo/ROOT/index.html b/jetty-distribution/src/main/resources/webapps.demo/ROOT/index.html index 8f73374d37a..ce03053d93b 100644 --- a/jetty-distribution/src/main/resources/webapps.demo/ROOT/index.html +++ b/jetty-distribution/src/main/resources/webapps.demo/ROOT/index.html @@ -43,12 +43,12 @@

information ...

From 73fd838b41c7792a444107c7ca74bddb5ce6141d Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 21 Jun 2013 12:10:06 -0700 Subject: [PATCH 08/29] Addressing WebSocket server side disconnect issue that autobahn found --- .../jetty/websocket/common/io/IOState.java | 5 +- .../websocket/server/IdleTimeoutTest.java | 22 +++-- .../server/WebSocketOverSSLTest.java | 4 +- .../jetty/websocket/server/ab/Fuzzer.java | 60 +++++-------- .../websocket/server/ab/TestABCase1.java | 1 - .../websocket/server/ab/TestABCase2.java | 51 +++++------ .../websocket/server/ab/TestABCase6.java | 84 ++++++++++--------- .../server/ab/TestABCase6_BadUTF.java | 2 +- .../server/blockhead/BlockheadClient.java | 36 +++++++- 9 files changed, 142 insertions(+), 123 deletions(-) diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java index 3836ae6633d..ff6b4cfca73 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java @@ -230,9 +230,10 @@ public class IOState { notifyStateListeners(event); - // if SHUTDOWN, we don't expect an answer. - if (close.getStatusCode() == StatusCode.SHUTDOWN) + // if harsh, we don't expect an answer. + if (close.isHarsh()) { + LOG.debug("Harsh close, disconnecting"); synchronized (this.state) { this.state = ConnectionState.CLOSED; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdleTimeoutTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdleTimeoutTest.java index 21ffcaeda66..97e34c6625d 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdleTimeoutTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdleTimeoutTest.java @@ -23,8 +23,12 @@ import static org.hamcrest.Matchers.*; import java.io.IOException; import java.util.concurrent.TimeUnit; +import org.eclipse.jetty.websocket.api.StatusCode; +import org.eclipse.jetty.websocket.common.CloseInfo; +import org.eclipse.jetty.websocket.common.OpCode; import org.eclipse.jetty.websocket.common.WebSocketFrame; import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; +import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; import org.eclipse.jetty.websocket.server.helper.RFCSocket; import org.eclipse.jetty.websocket.servlet.WebSocketServlet; import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; @@ -69,7 +73,7 @@ public class IdleTimeoutTest { BlockheadClient client = new BlockheadClient(server.getServerUri()); client.setProtocols("onConnect"); - client.setTimeout(TimeUnit.MILLISECONDS,1500); + client.setTimeout(TimeUnit.MILLISECONDS,2500); try { client.connect(); @@ -83,13 +87,15 @@ public class IdleTimeoutTest // Write to server (the server should be timed out and disconnect now) client.write(WebSocketFrame.text("Hello")); - // now attempt to read 2 echoed frames from server (shouldn't work) - client.readFrames(2,TimeUnit.MILLISECONDS,1500); - Assert.fail("Should have resulted in IOException"); - } - catch (IOException e) - { - Assert.assertThat("IOException",e.getMessage(),anyOf(containsString("closed"),containsString("disconnected"))); + // now read 1 frame from server (should be close frame) + IncomingFramesCapture capture = client.readFrames(1,TimeUnit.MILLISECONDS,1500); + WebSocketFrame frame = capture.getFrames().poll(); + Assert.assertThat("Was close frame", frame.getOpCode(), is(OpCode.CLOSE)); + CloseInfo close = new CloseInfo(frame); + Assert.assertThat("Close.code", close.getStatusCode(), is(StatusCode.SHUTDOWN)); + Assert.assertThat("Close.reason", close.getReason(), containsString("Idle Timeout")); + + client.expectServerDisconnect(); } finally { diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java index f0676b1c8c6..89ea4155354 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java @@ -65,7 +65,9 @@ public class WebSocketOverSSLTest client.start(); CaptureSocket clientSocket = new CaptureSocket(); - Future fut = client.connect(clientSocket,server.getServerUri()); + URI requestUri = server.getServerUri(); + System.err.printf("Request URI: %s%n",requestUri.toASCIIString()); + Future fut = client.connect(clientSocket,requestUri); // wait for connect Session session = fut.get(3,TimeUnit.SECONDS); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java index 5c9d07c6f74..82b2ce94e3d 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java @@ -62,13 +62,18 @@ public class Fuzzer PER_FRAME, SLOW } + + public static enum DisconnectMode + { + /** Disconnect occurred after a proper close handshake */ + CLEAN, + /** Disconnect occurred in a harsh manner, without a close handshake */ + UNCLEAN + } private static final int KBYTE = 1024; private static final int MBYTE = KBYTE * KBYTE; - public static final boolean CLEAN_CLOSE = true; - public static final boolean NOT_CLEAN_CLOSE = false; - private static final Logger LOG = Log.getLogger(Fuzzer.class); // Client side framing mask @@ -88,6 +93,7 @@ public class Fuzzer int bigMessageSize = 20 * MBYTE; policy.setMaxMessageSize(bigMessageSize); + policy.setIdleTimeout(5000); this.client = new BlockheadClient(policy,testcase.getServer().getServerUri()); this.generator = testcase.getLaxGenerator(); @@ -183,35 +189,21 @@ public class Fuzzer // TODO Should test for no more frames. success if connection closed. } - public void expectServerClose(boolean wasClean) throws IOException, InterruptedException + public void expectServerDisconnect(DisconnectMode mode) { - // we expect that the close handshake to have occurred and the server should have closed the connection - try - { - ByteBuffer buf = ByteBuffer.wrap(new byte[] - { 0x00 }); - BufferUtil.flipToFill(buf); - int len = client.read(buf); - - Assert.assertThat("Server has not closed socket",len,lessThanOrEqualTo(0)); - } - catch (IOException e) - { - // valid path - } - + client.expectServerDisconnect(); IOState ios = client.getIOState(); - if (wasClean) + switch (mode) { - Assert.assertTrue(ios.wasRemoteCloseInitiated()); - Assert.assertTrue(ios.wasCleanClose()); + case CLEAN: + Assert.assertTrue(ios.wasRemoteCloseInitiated()); + Assert.assertTrue(ios.wasCleanClose()); + break; + case UNCLEAN: + Assert.assertTrue(ios.wasRemoteCloseInitiated()); + break; } - else - { - Assert.assertTrue(ios.wasRemoteCloseInitiated()); - } - } public CloseState getCloseState() @@ -342,20 +334,6 @@ public class Fuzzer } } - public void sendExpectingIOException(ByteBuffer part3) - { - try - { - send(part3); - Assert.fail("Expected a IOException on this send"); - } - catch (IOException ignore) - { - // Send, but expect the send to fail with a IOException. - // Usually, this is a SocketException("Socket Closed") condition. - } - } - private void setClientMask(WebSocketFrame f) { if (LOG.isDebugEnabled()) diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java index 5cecc19726c..53446c045b9 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java @@ -51,7 +51,6 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); - fuzzer.expectServerClose(Fuzzer.CLEAN_CLOSE); } finally { diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java index 873764c1707..3a9f5e1576e 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java @@ -24,6 +24,7 @@ import java.util.List; import org.eclipse.jetty.toolchain.test.AdvancedRunner; import org.eclipse.jetty.util.StringUtil; +import org.eclipse.jetty.util.log.StacklessLogging; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.common.CloseInfo; import org.eclipse.jetty.websocket.common.OpCode; @@ -236,32 +237,32 @@ public class TestABCase2 extends AbstractABCase @Test public void testCase2_5() throws Exception { - // Disable Long Stacks from Parser (we know this test will throw an exception) - enableStacks(Parser.class,false); - - byte payload[] = new byte[126]; // intentionally too big - Arrays.fill(payload,(byte)'5'); - - List send = new ArrayList<>(); - // trick websocket frame into making extra large payload for ping - send.add(WebSocketFrame.binary(payload).setOpCode(OpCode.PING)); - send.add(new CloseInfo(StatusCode.NORMAL,"Test 2.5").asFrame()); - - List expect = new ArrayList<>(); - expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); - - Fuzzer fuzzer = new Fuzzer(this); - try + try(StacklessLogging scope = new StacklessLogging(Parser.class)) { - fuzzer.connect(); - fuzzer.setSendMode(Fuzzer.SendMode.BULK); - fuzzer.send(send); - fuzzer.expect(expect); - } - finally - { - enableStacks(Parser.class,true); - fuzzer.close(); + byte payload[] = new byte[126]; // intentionally too big + Arrays.fill(payload,(byte)'5'); + + List send = new ArrayList<>(); + // trick websocket frame into making extra large payload for ping + send.add(WebSocketFrame.binary(payload).setOpCode(OpCode.PING)); + send.add(new CloseInfo(StatusCode.NORMAL,"Test 2.5").asFrame()); + + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.PROTOCOL).asFrame()); + + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); + fuzzer.setSendMode(Fuzzer.SendMode.BULK); + fuzzer.send(send); + fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); + } + finally + { + fuzzer.close(); + } } } diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java index fbf87f84818..b7aa7b37cf9 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java @@ -28,6 +28,7 @@ import org.eclipse.jetty.toolchain.test.annotation.Slow; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.TypeUtil; +import org.eclipse.jetty.util.log.StacklessLogging; import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.common.CloseInfo; import org.eclipse.jetty.websocket.common.OpCode; @@ -358,54 +359,55 @@ public class TestABCase6 extends AbstractABCase public void testCase6_4_3() throws Exception { // Disable Long Stacks from Parser (we know this test will throw an exception) - enableStacks(Parser.class,false); - - ByteBuffer payload = ByteBuffer.allocate(64); - BufferUtil.clearToFill(payload); - payload.put(TypeUtil.fromHexString("cebae1bdb9cf83cebcceb5")); // good - payload.put(TypeUtil.fromHexString("f4908080")); // INVALID - payload.put(TypeUtil.fromHexString("656469746564")); // good - BufferUtil.flipToFlush(payload,0); - - List send = new ArrayList<>(); - send.add(new WebSocketFrame(OpCode.TEXT).setPayload(payload)); - send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); - - List expect = new ArrayList<>(); - expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); - - Fuzzer fuzzer = new Fuzzer(this); - try + try(StacklessLogging scope = new StacklessLogging(Parser.class)) { - fuzzer.connect(); + ByteBuffer payload = ByteBuffer.allocate(64); + BufferUtil.clearToFill(payload); + payload.put(TypeUtil.fromHexString("cebae1bdb9cf83cebcceb5")); // good + payload.put(TypeUtil.fromHexString("f4908080")); // INVALID + payload.put(TypeUtil.fromHexString("656469746564")); // good + BufferUtil.flipToFlush(payload,0); - ByteBuffer net = fuzzer.asNetworkBuffer(send); + List send = new ArrayList<>(); + send.add(new WebSocketFrame(OpCode.TEXT).setPayload(payload)); + send.add(new CloseInfo(StatusCode.NORMAL).asFrame()); - int splits[] = - { 17, 21, net.limit() }; + List expect = new ArrayList<>(); + expect.add(new CloseInfo(StatusCode.BAD_PAYLOAD).asFrame()); - ByteBuffer part1 = net.slice(); // Header + good UTF - part1.limit(splits[0]); - ByteBuffer part2 = net.slice(); // invalid UTF - part2.position(splits[0]); - part2.limit(splits[1]); - ByteBuffer part3 = net.slice(); // good UTF - part3.position(splits[1]); - part3.limit(splits[2]); + Fuzzer fuzzer = new Fuzzer(this); + try + { + fuzzer.connect(); - fuzzer.send(part1); // the header + good utf - TimeUnit.SECONDS.sleep(1); - fuzzer.send(part2); // the bad UTF + ByteBuffer net = fuzzer.asNetworkBuffer(send); - fuzzer.expect(expect); + int splits[] = + { 17, 21, net.limit() }; - TimeUnit.SECONDS.sleep(1); - fuzzer.sendExpectingIOException(part3); // the rest (shouldn't work) - } - finally - { - enableStacks(Parser.class,true); - fuzzer.close(); + ByteBuffer part1 = net.slice(); // Header + good UTF + part1.limit(splits[0]); + ByteBuffer part2 = net.slice(); // invalid UTF + part2.position(splits[0]); + part2.limit(splits[1]); + ByteBuffer part3 = net.slice(); // good UTF + part3.position(splits[1]); + part3.limit(splits[2]); + + fuzzer.send(part1); // the header + good utf + TimeUnit.SECONDS.sleep(1); + fuzzer.send(part2); // the bad UTF + + fuzzer.expect(expect); + + TimeUnit.SECONDS.sleep(1); + fuzzer.send(part3); // the rest (shouldn't work) + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.UNCLEAN); + } + finally + { + fuzzer.close(); + } } } diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_BadUTF.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_BadUTF.java index b93b6ba2fa2..6767586a4ba 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_BadUTF.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_BadUTF.java @@ -168,7 +168,7 @@ public class TestABCase6_BadUTF extends AbstractABCase fuzzer.setSendMode(Fuzzer.SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); - fuzzer.expectServerClose(Fuzzer.NOT_CLEAN_CLOSE); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.UNCLEAN); } finally { diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java index 4b1f7358a03..8573c931334 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java @@ -29,6 +29,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; import java.net.SocketAddress; +import java.net.SocketTimeoutException; import java.net.URI; import java.net.URISyntaxException; import java.nio.ByteBuffer; @@ -125,10 +126,8 @@ public class BlockheadClient implements IncomingFrames, OutgoingFrames, Connecti { Assert.assertThat("Websocket URI scheme",destWebsocketURI.getScheme(),anyOf(is("ws"),is("wss"))); this.destWebsocketURI = destWebsocketURI; - String scheme = "http"; if (destWebsocketURI.getScheme().equals("wss")) { - scheme = "https"; throw new RuntimeException("Sorry, BlockheadClient does not support SSL"); } this.destHttpURI = WSURI.toHttp(destWebsocketURI); @@ -415,7 +414,8 @@ public class BlockheadClient implements IncomingFrames, OutgoingFrames, Connecti switch (state) { case CLOSED: - this.disconnect(); + // Per Spec, client should not initiate disconnect on its own + // this.disconnect(); break; case CLOSING: if (ioState.wasRemoteCloseInitiated()) @@ -465,6 +465,36 @@ public class BlockheadClient implements IncomingFrames, OutgoingFrames, Connecti } } + public void expectServerDisconnect() + { + if (eof) + { + return; + } + + try + { + int len = in.read(); + if (len == (-1)) + { + // we are disconnected + eof = true; + return; + } + + Assert.assertThat("Expecting no data and proper socket disconnect (issued from server)",len,is(-1)); + } + catch (SocketTimeoutException e) + { + LOG.warn(e); + Assert.fail("Expected a server initiated disconnect, instead the read timed out"); + } + catch (IOException e) + { + // acceptable path + } + } + public int read(ByteBuffer buf) throws IOException { if (eof) From ebe98022abf5d67cd08d454af69e544f850c0609 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 21 Jun 2013 12:46:10 -0700 Subject: [PATCH 09/29] Making autobahn server disconnect happy --- .../io/AbstractWebSocketConnection.java | 20 +++++++++++++++++-- .../jetty/websocket/common/io/IOState.java | 6 ++++++ .../server/WebSocketServerConnection.java | 3 ++- .../websocket/server/ab/TestABCase1.java | 16 +++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java index cf37519d0a3..032c45c1218 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java @@ -141,6 +141,21 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp return String.format("%s@%x",FlushInvoker.class.getSimpleName(),hashCode()); } } + + public class OnDisconnectCallback implements WriteCallback + { + @Override + public void writeFailed(Throwable x) + { + disconnect(); + } + + @Override + public void writeSuccess() + { + disconnect(); + } + } public static class Stats { @@ -233,6 +248,7 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp @Override public void disconnect() { + LOG.debug("{} disconnect()", policy.getBehavior()); synchronized (writeBytes) { if (!writeBytes.isClosed()) @@ -426,7 +442,7 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp @Override public void onConnectionStateChange(ConnectionState state) { - LOG.debug("Connection State Change: {}",state); + LOG.debug("{} Connection State Change: {}",policy.getBehavior(),state); switch (state) { case OPEN: @@ -439,7 +455,7 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp case CLOSING: CloseInfo close = ioState.getCloseInfo(); // append close frame - outgoingFrame(close.asFrame(),null); + outgoingFrame(close.asFrame(),new OnDisconnectCallback()); default: break; } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java index ff6b4cfca73..e5bfd086d4e 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/IOState.java @@ -182,11 +182,13 @@ public class IOState */ public void onCloseLocal(CloseInfo close) { + LOG.debug("onCloseLocal({})",close); ConnectionState event = null; ConnectionState initialState = this.state; if (initialState == ConnectionState.CLOSED) { // already closed + LOG.debug("already closed"); return; } @@ -224,10 +226,13 @@ public class IOState event = this.state; } } + + LOG.debug("event = {}",event); // Only notify on state change events if (event != null) { + LOG.debug("notifying state listeners: {}",event); notifyStateListeners(event); // if harsh, we don't expect an answer. @@ -254,6 +259,7 @@ public class IOState */ public void onCloseRemote(CloseInfo close) { + LOG.debug("onCloseRemote({})",close); ConnectionState event = null; synchronized (this.state) { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerConnection.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerConnection.java index 752972d7857..f899941a892 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerConnection.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerConnection.java @@ -27,6 +27,7 @@ import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.api.extensions.IncomingFrames; +import org.eclipse.jetty.websocket.common.ConnectionState; import org.eclipse.jetty.websocket.common.io.AbstractWebSocketConnection; public class WebSocketServerConnection extends AbstractWebSocketConnection @@ -74,7 +75,7 @@ public class WebSocketServerConnection extends AbstractWebSocketConnection } super.onOpen(); } - + @Override public void setNextIncomingFrames(IncomingFrames incoming) { diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java index 53446c045b9..a3e183cfa10 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java @@ -51,6 +51,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -82,6 +83,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -113,6 +115,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -144,6 +147,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -175,6 +179,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -206,6 +211,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -237,6 +243,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -274,6 +281,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSlowSendSegmentSize(segmentSize); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -302,6 +310,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -333,6 +342,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -364,6 +374,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -395,6 +406,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -426,6 +438,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -457,6 +470,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -488,6 +502,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSendMode(SendMode.BULK); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { @@ -525,6 +540,7 @@ public class TestABCase1 extends AbstractABCase fuzzer.setSlowSendSegmentSize(segmentSize); fuzzer.send(send); fuzzer.expect(expect); + fuzzer.expectServerDisconnect(Fuzzer.DisconnectMode.CLEAN); } finally { From bc5f2da1487044de60e58bdb449d682fa9d26fea Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 21 Jun 2013 15:23:22 -0500 Subject: [PATCH 10/29] set Version for re-release --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 7c5046235d3..4ef49576bf3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,4 @@ -jetty-9.0.4.v20130621 21 June 2013 +jetty-9.0.4.v20130621 - 21 June 2013 + 396706 CGI support parameters + 397051 Make JDBCLoginService data members protected to facilitate subclassing From 8927c188402781a0a3ec63d3d6035716fafbc1c1 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 21 Jun 2013 15:28:26 -0500 Subject: [PATCH 11/29] reset versions for release --- 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 +- 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/jetty-osgi-npn/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-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-server/pom.xml | 2 +- jetty-spdy/spdy-server/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 +- pom.xml | 2 +- tests/test-continuation/pom.xml | 2 +- tests/test-loginservice/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-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-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 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index 9a6c6e8acb3..a19d752f3ac 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.0.5-SNAPSHOT + 9.0.4-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 3e3d48dc6bb..4a02ff92120 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.0.5-SNAPSHOT + 9.0.4-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 25f20fcfda3..e88cde949b8 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 80d165662a4..0f30afe56f3 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index ef649226ea6..29a346103a7 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.0.5-SNAPSHOT + 9.0.4-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 60eb08b5006..b853eb80c9e 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.0.5-SNAPSHOT + 9.0.4-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 be8b6f49408..d5ba5960526 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.0.5-SNAPSHOT + 9.0.4-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 e7fcc7528f9..df9b6c586ae 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-httpservice diff --git a/jetty-osgi/jetty-osgi-npn/pom.xml b/jetty-osgi/jetty-osgi-npn/pom.xml index de04a5c5f6f..a625bcc468a 100644 --- a/jetty-osgi/jetty-osgi-npn/pom.xml +++ b/jetty-osgi/jetty-osgi-npn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-osgi-npn diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index b180cb7df25..86c24d4b559 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.0.5-SNAPSHOT + 9.0.4-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 31a2c39b6ce..14ad31c49d6 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.0.5-SNAPSHOT + 9.0.4-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 9120a43a3f9..e4cd558238b 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml index 7e4923454f8..a2ec7b0e583 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index 60df8ab8e84..858427eb2a7 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml index d2df0aaa9d3..924536d62b3 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 spdy-example-webapp diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml index af9bb4d2509..922099ed5f5 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 spdy-http-server diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml index 699a2e1bf7f..63175046b0c 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index e24e073f012..3980f625872 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index 8036f8ef5a4..f8822d88b09 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index cf0ca81a4d1..5d95b151e50 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index a2bae1ec042..a2551bdf1e5 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index a8e1d7ebb38..93dc564985f 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index aebaa96269e..f40e7e76c0c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 20 jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT Jetty :: Project http://www.eclipse.org/jetty pom diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index 36dfbf80626..936f4a1abf1 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index cc472957b70..7ba45e0b92e 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index aedc181b052..9330be8282d 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.5-SNAPSHOT + 9.0.4-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 e0fce942e14..a78216c8b49 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.0.5-SNAPSHOT + 9.0.4-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 0513c4e821b..91c24996d55 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index f0d4a03fd80..d72d95fb821 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index fc232ded383..cea8290cd16 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.5-SNAPSHOT + 9.0.4-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 1836e487eee..5b7b6d95438 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.0.5-SNAPSHOT + 9.0.4-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 477a5f703e1..f13b5f27720 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.0.5-SNAPSHOT + 9.0.4-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 2f5c2f0728c..08dbf69462d 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.0.5-SNAPSHOT + 9.0.4-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 f07097dbe59..6aa8b94d365 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.0.5-SNAPSHOT + 9.0.4-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 2b71367f759..cd27f69a0c5 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.0.5-SNAPSHOT + 9.0.4-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 031f2fce86a..dae132153a3 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.0.5-SNAPSHOT + 9.0.4-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 54da2e83181..8146e3e89ef 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.0.5-SNAPSHOT + 9.0.4-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 44344dd4c68..0859a289198 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.0.5-SNAPSHOT + 9.0.4-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 abef5923f88..bf6f03bc7a4 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.0.5-SNAPSHOT + 9.0.4-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 433b97a7001..2243dac04b5 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 298b46a96fd7e4e04d69ed2638aa52332b9717f0 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 21 Jun 2013 15:35:58 -0500 Subject: [PATCH 12/29] set for re-reelease --- examples/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index e311e4d9465..1bda41bc19e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT ../pom.xml org.eclipse.jetty.examples diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 29826d2fc45..f9a021d8a3e 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-project diff --git a/tests/pom.xml b/tests/pom.xml index ecf5c4e0c8f..920b69b5afd 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT ../pom.xml org.eclipse.jetty.tests From 1ff665f76ac38faaa8831191b6b4be89fc1b2acf Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 24 Jun 2013 13:00:21 +1000 Subject: [PATCH 13/29] Code cleanups for direct RequestDispatcher access --- .../java/org/eclipse/jetty/server/Response.java | 9 +++++---- .../eclipse/jetty/servlet/ServletHandler.java | 16 +++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java index 272955324c0..2ab4e6c9f09 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.Enumeration; import java.util.Locale; +import javax.servlet.RequestDispatcher; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; @@ -341,10 +342,10 @@ public class Response implements HttpServletResponse error_handler = _connection.getConnector().getServer().getBean(ErrorHandler.class); if (error_handler!=null) { - request.setAttribute(Dispatcher.ERROR_STATUS_CODE,new Integer(code)); - request.setAttribute(Dispatcher.ERROR_MESSAGE, message); - request.setAttribute(Dispatcher.ERROR_REQUEST_URI, request.getRequestURI()); - request.setAttribute(Dispatcher.ERROR_SERVLET_NAME,request.getServletName()); + request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,new Integer(code)); + request.setAttribute(RequestDispatcher.ERROR_MESSAGE, message); + request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI, request.getRequestURI()); + request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,request.getServletName()); error_handler.handle(null,_connection.getRequest(),_connection.getRequest(),this ); } else diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 14e5fe054ca..05d0ce25ee8 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -24,20 +24,19 @@ import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; -import java.util.HashSet; -import java.util.ListIterator; -import java.util.Set; import java.util.List; +import java.util.ListIterator; import java.util.Map; import java.util.Queue; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; -import javax.servlet.AsyncContext; import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; +import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -58,7 +57,6 @@ import org.eclipse.jetty.security.IdentityService; import org.eclipse.jetty.security.SecurityHandler; import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Dispatcher; -import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServletRequestHttpWrapper; @@ -393,8 +391,8 @@ public class ServletHandler extends ScopedHandler if (DispatcherType.INCLUDE.equals(type)) { - baseRequest.setAttribute(Dispatcher.INCLUDE_SERVLET_PATH,servlet_path); - baseRequest.setAttribute(Dispatcher.INCLUDE_PATH_INFO, path_info); + baseRequest.setAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH,servlet_path); + baseRequest.setAttribute(RequestDispatcher.INCLUDE_PATH_INFO, path_info); } else { @@ -562,8 +560,8 @@ public class ServletHandler extends ScopedHandler if (!response.isCommitted()) { - request.setAttribute(Dispatcher.ERROR_EXCEPTION_TYPE,th.getClass()); - request.setAttribute(Dispatcher.ERROR_EXCEPTION,th); + request.setAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE,th.getClass()); + request.setAttribute(RequestDispatcher.ERROR_EXCEPTION,th); if (th instanceof UnavailableException) { UnavailableException ue = (UnavailableException)th; From b2b2ce25fc5caa7383a78600d0bfa070370f237b Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 24 Jun 2013 13:11:04 +1000 Subject: [PATCH 14/29] Revert "Code cleanups for direct RequestDispatcher access" This reverts commit 1ff665f76ac38faaa8831191b6b4be89fc1b2acf. --- .../java/org/eclipse/jetty/server/Response.java | 9 ++++----- .../eclipse/jetty/servlet/ServletHandler.java | 16 +++++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java index 2ab4e6c9f09..272955324c0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java @@ -26,7 +26,6 @@ import java.util.Collections; import java.util.Enumeration; import java.util.Locale; -import javax.servlet.RequestDispatcher; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; @@ -342,10 +341,10 @@ public class Response implements HttpServletResponse error_handler = _connection.getConnector().getServer().getBean(ErrorHandler.class); if (error_handler!=null) { - request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,new Integer(code)); - request.setAttribute(RequestDispatcher.ERROR_MESSAGE, message); - request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI, request.getRequestURI()); - request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,request.getServletName()); + request.setAttribute(Dispatcher.ERROR_STATUS_CODE,new Integer(code)); + request.setAttribute(Dispatcher.ERROR_MESSAGE, message); + request.setAttribute(Dispatcher.ERROR_REQUEST_URI, request.getRequestURI()); + request.setAttribute(Dispatcher.ERROR_SERVLET_NAME,request.getServletName()); error_handler.handle(null,_connection.getRequest(),_connection.getRequest(),this ); } else diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 05d0ce25ee8..14e5fe054ca 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -24,19 +24,20 @@ import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; -import java.util.List; +import java.util.HashSet; import java.util.ListIterator; +import java.util.Set; +import java.util.List; import java.util.Map; import java.util.Queue; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; +import javax.servlet.AsyncContext; import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; -import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -57,6 +58,7 @@ import org.eclipse.jetty.security.IdentityService; import org.eclipse.jetty.security.SecurityHandler; import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Dispatcher; +import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServletRequestHttpWrapper; @@ -391,8 +393,8 @@ public class ServletHandler extends ScopedHandler if (DispatcherType.INCLUDE.equals(type)) { - baseRequest.setAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH,servlet_path); - baseRequest.setAttribute(RequestDispatcher.INCLUDE_PATH_INFO, path_info); + baseRequest.setAttribute(Dispatcher.INCLUDE_SERVLET_PATH,servlet_path); + baseRequest.setAttribute(Dispatcher.INCLUDE_PATH_INFO, path_info); } else { @@ -560,8 +562,8 @@ public class ServletHandler extends ScopedHandler if (!response.isCommitted()) { - request.setAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE,th.getClass()); - request.setAttribute(RequestDispatcher.ERROR_EXCEPTION,th); + request.setAttribute(Dispatcher.ERROR_EXCEPTION_TYPE,th.getClass()); + request.setAttribute(Dispatcher.ERROR_EXCEPTION,th); if (th instanceof UnavailableException) { UnavailableException ue = (UnavailableException)th; From 068e67a8df4d65d1c3645659ffb8e2582171b7a1 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 24 Jun 2013 13:13:03 +1000 Subject: [PATCH 15/29] Code cleanups for direct RequestDispatcher access --- .../src/main/java/org/eclipse/jetty/server/Response.java | 9 +++++---- .../java/org/eclipse/jetty/servlet/ServletHandler.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java index 272955324c0..2ab4e6c9f09 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.Enumeration; import java.util.Locale; +import javax.servlet.RequestDispatcher; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; @@ -341,10 +342,10 @@ public class Response implements HttpServletResponse error_handler = _connection.getConnector().getServer().getBean(ErrorHandler.class); if (error_handler!=null) { - request.setAttribute(Dispatcher.ERROR_STATUS_CODE,new Integer(code)); - request.setAttribute(Dispatcher.ERROR_MESSAGE, message); - request.setAttribute(Dispatcher.ERROR_REQUEST_URI, request.getRequestURI()); - request.setAttribute(Dispatcher.ERROR_SERVLET_NAME,request.getServletName()); + request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,new Integer(code)); + request.setAttribute(RequestDispatcher.ERROR_MESSAGE, message); + request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI, request.getRequestURI()); + request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,request.getServletName()); error_handler.handle(null,_connection.getRequest(),_connection.getRequest(),this ); } else diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 14e5fe054ca..9aff148ce98 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -38,6 +38,7 @@ import javax.servlet.AsyncContext; import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; +import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -562,8 +563,8 @@ public class ServletHandler extends ScopedHandler if (!response.isCommitted()) { - request.setAttribute(Dispatcher.ERROR_EXCEPTION_TYPE,th.getClass()); - request.setAttribute(Dispatcher.ERROR_EXCEPTION,th); + request.setAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE,th.getClass()); + request.setAttribute(RequestDispatcher.ERROR_EXCEPTION,th); if (th instanceof UnavailableException) { UnavailableException ue = (UnavailableException)th; @@ -588,8 +589,8 @@ public class ServletHandler extends ScopedHandler // TODO httpResponse.getHttpConnection().forceClose(); if (!response.isCommitted()) { - request.setAttribute(Dispatcher.ERROR_EXCEPTION_TYPE,e.getClass()); - request.setAttribute(Dispatcher.ERROR_EXCEPTION,e); + request.setAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE,e.getClass()); + request.setAttribute(RequestDispatcher.ERROR_EXCEPTION,e); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } else From 0daddd1a3acf1609169de229b1f33aa2307ce981 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 24 Jun 2013 16:20:04 +1000 Subject: [PATCH 16/29] 411458 MultiPartFilter getParameterMap doesn't preserve multivalued parameters 411459 MultiPartFilter.Wrapper getParameter should use charset encoding of part --- .../jetty/servlets/MultiPartFilter.java | 32 +++++++-- .../jetty/servlets/MultipartFilterTest.java | 72 +++++++++++++++++-- .../org/eclipse/jetty/testing/HttpTester.java | 9 +++ 3 files changed, 103 insertions(+), 10 deletions(-) diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java index c872e936faa..f8d2d3e8b1d 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java @@ -48,12 +48,15 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; +import org.eclipse.jetty.http.MimeTypes; +import org.eclipse.jetty.io.ByteArrayBuffer; import org.eclipse.jetty.util.B64Code; import org.eclipse.jetty.util.LazyList; import org.eclipse.jetty.util.MultiMap; import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.ReadLineInputStream; import org.eclipse.jetty.util.StringUtil; +import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; @@ -513,12 +516,11 @@ public class MultiPartFilter implements Filter { try { - String s=new String((byte[])o,_encoding); - return s; + return getParameterBytesAsString(name, (byte[])o); } catch(Exception e) { - e.printStackTrace(); + LOG.warn(e); } } else if (o!=null) @@ -533,11 +535,11 @@ public class MultiPartFilter implements Filter @Override public Map getParameterMap() { - Map cmap = new HashMap(); + Map cmap = new HashMap(); for ( Object key : _params.keySet() ) { - cmap.put((String)key,getParameter((String)key)); + cmap.put((String)key,getParameterValues((String)key)); } return Collections.unmodifiableMap(cmap); @@ -571,7 +573,7 @@ public class MultiPartFilter implements Filter { try { - v[i]=new String((byte[])o,_encoding); + v[i]=getParameterBytesAsString(name, (byte[])o); } catch(Exception e) { @@ -594,6 +596,24 @@ public class MultiPartFilter implements Filter { _encoding=enc; } + + + /* ------------------------------------------------------------------------------- */ + private String getParameterBytesAsString (String name, byte[] bytes) + throws UnsupportedEncodingException + { + //check if there is a specific encoding for the parameter + Object ct = _params.get(name+CONTENT_TYPE_SUFFIX); + //use default if not + String contentType = _encoding; + if (ct != null) + { + String tmp = MimeTypes.getCharsetFromContentType(new ByteArrayBuffer((String)ct)); + contentType = (tmp == null?_encoding:tmp); + } + + return new String(bytes,contentType); + } } private static class Base64InputStream extends InputStream diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java index 5f12d70442c..a610a0f3705 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java @@ -21,21 +21,26 @@ package org.eclipse.jetty.servlets; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.PrintWriter; +import java.lang.reflect.Array; +import java.util.Map; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jetty.io.ByteArrayBuffer; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.FilterMapping; import org.eclipse.jetty.testing.HttpTester; import org.eclipse.jetty.testing.ServletTester; import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.StringUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -747,7 +752,7 @@ public class MultipartFilterTest assertTrue(response.getContent().contains("aaaa,bbbbb")); } - + /* * see the testParameterMap test * @@ -758,13 +763,12 @@ public class MultipartFilterTest @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - String content = (String)req.getParameterMap().get("\"strup\"Content-Type: application/octet-stream"); + String content = (String)req.getParameter("\"strup\"Content-Type: application/octet-stream"); assertThat(content, containsString("How now brown cow.")); super.doPost(req, resp); - } - + } } /** @@ -809,6 +813,66 @@ public class MultipartFilterTest assertTrue(response.getContent().indexOf("brown cow")>=0); } + + public static class TestServletCharSet extends HttpServlet + { + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + //test that the multipart content bytes were converted correctly from their charset to unicode + String content = (String)req.getParameter("ttt"); + assertNotNull(content); + assertEquals("ttt\u01FCzzz",content); + assertEquals("application/octet-stream; charset=UTF-8",req.getParameter("ttt"+MultiPartFilter.CONTENT_TYPE_SUFFIX)); + + + //test that the parameter map retrieves values as String[] + Map map = req.getParameterMap(); + Object o = map.get("ttt"); + assertTrue(o.getClass().isArray()); + super.doPost(req, resp); + } + } + + + @Test + public void testWithCharSet() + throws Exception + { + // generated and parsed test + HttpTester request = new HttpTester() { + + }; + HttpTester response = new HttpTester(); + + tester.addServlet(TestServletCharSet.class,"/test2"); + + // test GET + request.setMethod("POST"); + request.setVersion("HTTP/1.0"); + request.setHeader("Host","tester"); + request.setURI("/context/test2"); + + String boundary="XyXyXy"; + request.setHeader("Content-Type","multipart/form-data; boundary="+boundary); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + baos.write(("--" + boundary + "\r\n"+ + "Content-Disposition: form-data; name=\"ttt\"\r\n"+ + "Content-Type: application/octet-stream; charset=UTF-8\r\n\r\n").getBytes()); + baos.write("ttt\u01FCzzz".getBytes(StringUtil.__UTF8)); + baos.write(("\r\n--" + boundary + "--\r\n\r\n").getBytes()); + + request.setContentBytes(baos.toByteArray()); + + response.parse(tester.getResponses(new ByteArrayBuffer(request.generate().getBytes(StringUtil.__UTF8))).toString()); + } + + + + public static class DumpServlet extends HttpServlet { private static final long serialVersionUID = 201012011130L; diff --git a/test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java b/test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java index 67ed36b4d11..422334b11e2 100644 --- a/test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java +++ b/test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java @@ -531,6 +531,15 @@ public class HttpTester _genContent=null; } } + + /* ------------------------------------------------------------ */ + public void setContentBytes(byte[] bytes) + { + _parsedContent = null; + _genContent = bytes; + setLongHeader(HttpHeaders.CONTENT_LENGTH, bytes.length); + + } /* ------------------------------------------------------------ */ private class PH extends HttpParser.EventHandler From 4d0a796f72d4167e65bc006dcb930583c3a1a7cf Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 24 Jun 2013 17:09:44 +1000 Subject: [PATCH 17/29] 405424 X-Powered-By header --- .../org/eclipse/jetty/http/HttpGenerator.java | 70 ++++++++++++------- .../org/eclipse/jetty/http/HttpHeader.java | 2 + .../jetty/http/HttpGeneratorServerTest.java | 49 +++++++++++++ .../jetty/server/HttpConfiguration.java | 14 +++- .../eclipse/jetty/server/HttpConnection.java | 3 +- 5 files changed, 108 insertions(+), 30 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 54ecd0218e1..e02485b643d 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 @@ -55,13 +55,18 @@ public class HttpGenerator private long _contentPrepared = 0; private boolean _noContent = false; private Boolean _persistent = null; - private boolean _sendServerVersion; + + private final int _send; + private final static int SEND_SERVER=0x01; + private final static int SEND_XPOWEREDBY=0x02; /* ------------------------------------------------------------------------------- */ public static void setServerVersion(String version) { - SERVER=StringUtil.getBytes("Server: Jetty("+version+")\015\012"); + SEND[SEND_SERVER]=StringUtil.getBytes("Server: Jetty("+version+")\015\012"); + SEND[SEND_XPOWEREDBY]=StringUtil.getBytes("X-Powered-By: Jetty("+version+")\015\012"); + SEND[SEND_SERVER|SEND_XPOWEREDBY]=StringUtil.getBytes("Server: Jetty("+version+")\015\012X-Powered-By: Jetty("+version+")\015\012"); } /* ------------------------------------------------------------------------------- */ @@ -71,6 +76,13 @@ public class HttpGenerator /* ------------------------------------------------------------------------------- */ public HttpGenerator() { + this(false,false); + } + + /* ------------------------------------------------------------------------------- */ + public HttpGenerator(boolean sendServerVersion,boolean sendXPoweredBy) + { + _send=(sendServerVersion?SEND_SERVER:0) | (sendXPoweredBy?SEND_XPOWEREDBY:0); } /* ------------------------------------------------------------------------------- */ @@ -86,15 +98,17 @@ public class HttpGenerator } /* ------------------------------------------------------------ */ + @Deprecated public boolean getSendServerVersion () { - return _sendServerVersion; + return (_send&SEND_SERVER)!=0; } /* ------------------------------------------------------------ */ + @Deprecated public void setSendServerVersion (boolean sendServerVersion) { - _sendServerVersion = sendServerVersion; + throw new UnsupportedOperationException(); } /* ------------------------------------------------------------ */ @@ -537,11 +551,11 @@ public class HttpGenerator /* ------------------------------------------------------------ */ private void generateHeaders(Info _info,ByteBuffer header,ByteBuffer content,boolean last) { - final RequestInfo _request=(_info instanceof RequestInfo)?(RequestInfo)_info:null; - final ResponseInfo _response=(_info instanceof ResponseInfo)?(ResponseInfo)_info:null; + final RequestInfo request=(_info instanceof RequestInfo)?(RequestInfo)_info:null; + final ResponseInfo response=(_info instanceof ResponseInfo)?(ResponseInfo)_info:null; // default field values - boolean has_server = false; + int send=_send; HttpField transfer_encoding=null; boolean keep_alive=false; boolean close=false; @@ -584,7 +598,7 @@ public class HttpGenerator case CONNECTION: { - if (_request!=null) + if (request!=null) field.putTo(header); // Lookup and/or split connection value field @@ -619,7 +633,7 @@ public class HttpGenerator case CLOSE: { close=true; - if (_response!=null) + if (response!=null) { _persistent=false; if (_endOfContent == EndOfContent.UNKNOWN_CONTENT) @@ -633,7 +647,7 @@ public class HttpGenerator if (_info.getHttpVersion() == HttpVersion.HTTP_1_0) { keep_alive = true; - if (_response!=null) + if (response!=null) _persistent=true; } break; @@ -656,11 +670,8 @@ public class HttpGenerator case SERVER: { - if (getSendServerVersion()) - { - has_server=true; - field.putTo(header); - } + send=send&~SEND_SERVER; + field.putTo(header); break; } @@ -680,7 +691,7 @@ public class HttpGenerator // 4. Content-Length // 5. multipart/byteranges // 6. close - int status=_response!=null?_response.getStatus():-1; + int status=response!=null?response.getStatus():-1; switch (_endOfContent) { case UNKNOWN_CONTENT: @@ -688,14 +699,14 @@ public class HttpGenerator // written yet? // Response known not to have a body - if (_contentPrepared == 0 && _response!=null && (status < 200 || status == 204 || status == 304)) + if (_contentPrepared == 0 && response!=null && (status < 200 || status == 204 || status == 304)) _endOfContent=EndOfContent.NO_CONTENT; else if (_info.getContentLength()>0) { // we have been given a content length _endOfContent=EndOfContent.CONTENT_LENGTH; long content_length = _info.getContentLength(); - if ((_response!=null || content_length>0 || content_type ) && !_noContent) + if ((response!=null || content_length>0 || content_type ) && !_noContent) { // known length but not actually set. header.put(HttpHeader.CONTENT_LENGTH.getBytesColonSpace()); @@ -710,7 +721,7 @@ 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 ((response!=null || content_length>0 || content_type ) && !_noContent) { header.put(HttpHeader.CONTENT_LENGTH.getBytesColonSpace()); BufferUtil.putDecLong(header, content_length); @@ -721,7 +732,7 @@ public class HttpGenerator { // No idea, so we must assume that a body is coming _endOfContent = (!isPersistent() || _info.getHttpVersion().ordinal() < HttpVersion.HTTP_1_1.ordinal() ) ? EndOfContent.EOF_CONTENT : EndOfContent.CHUNKED_CONTENT; - if (_response!=null && _endOfContent==EndOfContent.EOF_CONTENT) + if (response!=null && _endOfContent==EndOfContent.EOF_CONTENT) { _endOfContent=EndOfContent.NO_CONTENT; _noContent=true; @@ -731,7 +742,7 @@ public class HttpGenerator case CONTENT_LENGTH: long content_length = _info.getContentLength(); - if ((_response!=null || content_length>0 || content_type ) && !_noContent) + if ((response!=null || content_length>0 || content_type ) && !_noContent) { // known length but not actually set. header.put(HttpHeader.CONTENT_LENGTH.getBytesColonSpace()); @@ -741,12 +752,12 @@ public class HttpGenerator break; case NO_CONTENT: - if (_response!=null && status >= 200 && status != 204 && status != 304) + if (response!=null && status >= 200 && status != 204 && status != 304) header.put(CONTENT_LENGTH_0); break; case EOF_CONTENT: - _persistent = _request!=null; + _persistent = request!=null; break; case CHUNKED_CONTENT: @@ -780,7 +791,7 @@ public class HttpGenerator } // If this is a response, work out persistence - if (_response!=null) + if (response!=null) { if (!isPersistent() && (close || _info.getHttpVersion().ordinal() > HttpVersion.HTTP_1_0.ordinal())) { @@ -814,8 +825,8 @@ public class HttpGenerator } } - if (!has_server && status>199 && getSendServerVersion()) - header.put(SERVER); + if (status>199) + header.put(SEND[send]); // end the header. header.put(HttpTokens.CRLF); @@ -851,7 +862,12 @@ public class HttpGenerator private static final byte[] HTTP_1_1_SPACE = StringUtil.getBytes(HttpVersion.HTTP_1_1+" "); private static final byte[] CRLF = StringUtil.getBytes("\015\012"); private static final byte[] TRANSFER_ENCODING_CHUNKED = StringUtil.getBytes("Transfer-Encoding: chunked\015\012"); - private static byte[] SERVER = StringUtil.getBytes("Server: Jetty(7.0.x)\015\012"); + private static final byte[][] SEND = new byte[][]{ + new byte[0], + StringUtil.getBytes("Server: Jetty(9.x.x)\015\012"), + StringUtil.getBytes("X-Powered-By: Jetty(9.x.x)\015\012"), + StringUtil.getBytes("Server: Jetty(9.x.x)\015\012X-Powered-By: Jetty(9.x.x)\015\012") + }; /* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */ diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpHeader.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpHeader.java index 202eae1a9bf..8bba922ce80 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpHeader.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpHeader.java @@ -108,6 +108,8 @@ public enum HttpHeader SET_COOKIE2("Set-Cookie2"), MIME_VERSION("MIME-Version"), IDENTITY("identity"), + + X_POWERED_BY("X-Powered-By"), UNKNOWN("::UNKNOWN::"); diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java index 262c0acb0e2..026fd2c3cba 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java +++ b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java @@ -34,6 +34,7 @@ import java.util.List; import org.eclipse.jetty.http.HttpGenerator.ResponseInfo; import org.eclipse.jetty.util.BufferUtil; +import org.hamcrest.Matchers; import org.junit.Test; public class HttpGeneratorServerTest @@ -309,6 +310,54 @@ public class HttpGeneratorServerTest } } } + + @Test + public void testSendServerXPoweredBy() throws Exception + { + ByteBuffer header = BufferUtil.allocate(8096); + ResponseInfo info = new ResponseInfo(HttpVersion.HTTP_1_1, new HttpFields(), -1, 200, null, false); + HttpFields fields = new HttpFields(); + fields.add(HttpHeader.SERVER,"SomeServer"); + fields.add(HttpHeader.X_POWERED_BY,"SomePower"); + ResponseInfo infoF = new ResponseInfo(HttpVersion.HTTP_1_1, fields, -1, 200, null, false); + String head; + + HttpGenerator gen = new HttpGenerator(true,true); + gen.generateResponse(info, header, null, null, true); + head = BufferUtil.toString(header); + BufferUtil.clear(header); + assertThat(head, containsString("HTTP/1.1 200 OK")); + assertThat(head, containsString("Server: Jetty(9.x.x)")); + assertThat(head, containsString("X-Powered-By: Jetty(9.x.x)")); + gen.reset(); + gen.generateResponse(infoF, header, null, null, true); + head = BufferUtil.toString(header); + BufferUtil.clear(header); + assertThat(head, containsString("HTTP/1.1 200 OK")); + assertThat(head, not(containsString("Server: Jetty(9.x.x)"))); + assertThat(head, containsString("Server: SomeServer")); + assertThat(head, containsString("X-Powered-By: Jetty(9.x.x)")); + assertThat(head, containsString("X-Powered-By: SomePower")); + gen.reset(); + + gen = new HttpGenerator(false,false); + gen.generateResponse(info, header, null, null, true); + head = BufferUtil.toString(header); + BufferUtil.clear(header); + assertThat(head, containsString("HTTP/1.1 200 OK")); + assertThat(head, not(containsString("Server: Jetty(9.x.x)"))); + assertThat(head, not(containsString("X-Powered-By: Jetty(9.x.x)"))); + gen.reset(); + gen.generateResponse(infoF, header, null, null, true); + head = BufferUtil.toString(header); + BufferUtil.clear(header); + assertThat(head, containsString("HTTP/1.1 200 OK")); + assertThat(head, not(containsString("Server: Jetty(9.x.x)"))); + assertThat(head, containsString("Server: SomeServer")); + assertThat(head, not(containsString("X-Powered-By: Jetty(9.x.x)"))); + assertThat(head, containsString("X-Powered-By: SomePower")); + gen.reset(); + } @Test public void testResponseNoContent() throws Exception diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java index e6ed10b185b..85f3b90ae02 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java @@ -48,6 +48,7 @@ public class HttpConfiguration private int _securePort; private String _secureScheme = HttpScheme.HTTPS.asString(); private boolean _sendServerVersion = true; //send Server: header + private boolean _sendXPoweredBy = false; //send X-Powered-By: header private boolean _sendDateHeader = false; //send Date: header @@ -150,11 +151,22 @@ public class HttpConfiguration _sendServerVersion = sendServerVersion; } - @ManagedAttribute("if true, include the server version in HTTP headers") + @ManagedAttribute("if true, send the Server header in responses") public boolean getSendServerVersion() { return _sendServerVersion; } + + public void setSendXPoweredBy (boolean sendXPoweredBy) + { + _sendXPoweredBy=sendXPoweredBy; + } + + @ManagedAttribute("if true, send the X-Powered-By header in responses") + public boolean getSendXPoweredBy() + { + return _sendXPoweredBy; + } public void setSendDateHeader(boolean sendDateHeader) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java index 616dc0d8e91..20b74ea5959 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java @@ -91,8 +91,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http _config = config; _connector = connector; _bufferPool = _connector.getByteBufferPool(); - _generator = new HttpGenerator(); - _generator.setSendServerVersion(_config.getSendServerVersion()); + _generator = new HttpGenerator(_config.getSendServerVersion(),_config.getSendXPoweredBy()); _channel = new HttpChannelOverHttp(connector, config, endPoint, this, new Input()); _parser = newHttpParser(); From c3c9d927b4629478da22f624753fc76f339a5f08 Mon Sep 17 00:00:00 2001 From: Thomas Becker Date: Mon, 24 Jun 2013 16:20:03 +0200 Subject: [PATCH 18/29] 410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway --- .../java/org/eclipse/jetty/spdy/client/SPDYConnection.java | 2 +- .../test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java index b77b9d6e548..c56210fbe21 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java @@ -62,7 +62,7 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id // // Due to a jvm bug we've had a Selector thread being stuck at // sun.nio.ch.FileDispatcherImpl.preClose0(Native Method). That's why we now default executeOnFillable to - // true even if for most use cases it is faster to not dispatch the IO events. + // true even if for most use cases it is faster to not dispatch the IO events. super(endPoint, executor, executeOnFillable); this.bufferPool = bufferPool; this.parser = parser; diff --git a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java index 9a4b3f35d9b..5e8e301db0d 100644 --- a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java +++ b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.eclipse.jetty.io.EofException; import org.eclipse.jetty.spdy.api.DataInfo; import org.eclipse.jetty.spdy.api.GoAwayInfo; import org.eclipse.jetty.spdy.api.GoAwayResultInfo; @@ -41,7 +40,6 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Fields; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.FuturePromise; -import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; @@ -223,7 +221,8 @@ public class GoAwayTest extends AbstractTest } catch (ExecutionException x) { - Assert.assertThat(x.getCause(), CoreMatchers.instanceOf(EofException.class)); + // doesn't matter which exception we get, it's important that the data is not been written and the + // previous assertion is true } // The last good stream is the second, because it was received by the server From 40fea41d4f5b4ddd0b6d2800051bfb74531fd562 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 24 Jun 2013 14:56:15 -0700 Subject: [PATCH 19/29] 411545 - SslConnection.DecryptedEndpoint.fill() sometimes misses a few network bytes + Adding continuation in this rare SSL case to allow the remaining bytes to be read properly. --- .../main/java/org/eclipse/jetty/io/ssl/SslConnection.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java index 19b65488f92..7342c91d203 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java @@ -618,6 +618,13 @@ public class SslConnection extends AbstractConnection } else { + if (_encryptedInput.hasRemaining()) + { + // if there are more encrypted bytes, + // then we need to unwrap more, we don't + // care if net_filled is zero + continue; + } // we need to wait for more net data return 0; } From f9864938274573ebc58300768ca7076421811dc5 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 24 Jun 2013 15:02:40 -0700 Subject: [PATCH 20/29] Making testcase more consistent --- .../websocket/server/WebSocketOverSSLTest.java | 13 ++++++++++--- .../websocket/server/helper/CaptureSocket.java | 9 ++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java index 89ea4155354..3502924b123 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java @@ -25,6 +25,9 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.EventQueue; +import org.eclipse.jetty.toolchain.test.TestTracker; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.server.helper.CaptureSocket; @@ -32,10 +35,14 @@ import org.eclipse.jetty.websocket.server.helper.SessionServlet; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; public class WebSocketOverSSLTest { + @Rule + public TestTracker tracker = new TestTracker(); + private static SimpleServletServer server; @BeforeClass @@ -144,13 +151,13 @@ public class WebSocketOverSSLTest CaptureSocket clientSocket = new CaptureSocket(); URI requestUri = server.getServerUri().resolve("/deep?a=b"); System.err.printf("Request URI: %s%n",requestUri.toASCIIString()); - client.connect(clientSocket,requestUri); + Future fut = client.connect(clientSocket,requestUri); // wait for connect - clientSocket.awaitConnected(5000); + Session session = fut.get(5,TimeUnit.SECONDS); // Generate text frame - clientSocket.getRemote().sendString("session.upgradeRequest.requestURI"); + session.getRemote().sendString("session.upgradeRequest.requestURI"); // Read frame (hopefully text frame) clientSocket.messages.awaitEventCount(1,500,TimeUnit.MILLISECONDS); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java index 847d9c85e8a..a1b597aa2b3 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java @@ -24,6 +24,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.EventQueue; +import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.WebSocketAdapter; public class CaptureSocket extends WebSocketAdapter @@ -53,12 +54,10 @@ public class CaptureSocket extends WebSocketAdapter } } - public void onClose(int closeCode, String message) - { - } - - public void onOpen(Connection connection) + @Override + public void onWebSocketConnect(Session sess) { + super.onWebSocketConnect(sess); latch.countDown(); } From 1f21c96f6c4eab5f4c6ddc7ef8dcc22eb396fad5 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 24 Jun 2013 14:56:15 -0700 Subject: [PATCH 21/29] 411545 - SslConnection.DecryptedEndpoint.fill() sometimes misses a few network bytes + Adding continuation in this rare SSL case to allow the remaining bytes to be read properly. --- .../main/java/org/eclipse/jetty/io/ssl/SslConnection.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java index 19b65488f92..7342c91d203 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java @@ -618,6 +618,13 @@ public class SslConnection extends AbstractConnection } else { + if (_encryptedInput.hasRemaining()) + { + // if there are more encrypted bytes, + // then we need to unwrap more, we don't + // care if net_filled is zero + continue; + } // we need to wait for more net data return 0; } From 1a190a176ef65c6883a1320eb91523de5468831c Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 24 Jun 2013 15:02:40 -0700 Subject: [PATCH 22/29] Making testcase more consistent --- .../websocket/server/WebSocketOverSSLTest.java | 13 ++++++++++--- .../websocket/server/helper/CaptureSocket.java | 9 ++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java index 89ea4155354..3502924b123 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java @@ -25,6 +25,9 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.EventQueue; +import org.eclipse.jetty.toolchain.test.TestTracker; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.server.helper.CaptureSocket; @@ -32,10 +35,14 @@ import org.eclipse.jetty.websocket.server.helper.SessionServlet; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; public class WebSocketOverSSLTest { + @Rule + public TestTracker tracker = new TestTracker(); + private static SimpleServletServer server; @BeforeClass @@ -144,13 +151,13 @@ public class WebSocketOverSSLTest CaptureSocket clientSocket = new CaptureSocket(); URI requestUri = server.getServerUri().resolve("/deep?a=b"); System.err.printf("Request URI: %s%n",requestUri.toASCIIString()); - client.connect(clientSocket,requestUri); + Future fut = client.connect(clientSocket,requestUri); // wait for connect - clientSocket.awaitConnected(5000); + Session session = fut.get(5,TimeUnit.SECONDS); // Generate text frame - clientSocket.getRemote().sendString("session.upgradeRequest.requestURI"); + session.getRemote().sendString("session.upgradeRequest.requestURI"); // Read frame (hopefully text frame) clientSocket.messages.awaitEventCount(1,500,TimeUnit.MILLISECONDS); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java index 847d9c85e8a..a1b597aa2b3 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java @@ -24,6 +24,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.EventQueue; +import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.WebSocketAdapter; public class CaptureSocket extends WebSocketAdapter @@ -53,12 +54,10 @@ public class CaptureSocket extends WebSocketAdapter } } - public void onClose(int closeCode, String message) - { - } - - public void onOpen(Connection connection) + @Override + public void onWebSocketConnect(Session sess) { + super.onWebSocketConnect(sess); latch.countDown(); } From 31faf2fe20dbf2cad18f8e3608cefd9a10638690 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 25 Jun 2013 07:42:45 -0700 Subject: [PATCH 23/29] Reverting failed release from friday --- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/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-overlay-deployer/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/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-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/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 122641b2c6a..13e2194554a 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index d75604169f1..01fe3ea3fb2 100755 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-ant diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index cfa10eb3ad2..4ba11e2cf74 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 047c8f293bc..f71dc603ea5 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index fc174140bbf..4ea462a633d 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index eebc1d395b4..5aff528e629 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index e8de81ef116..bbf3d08ab63 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 3da554a4c9a..a9a4ed7853a 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index d84da94c271..318f67e40bf 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 414e03b51ef..71728a363cd 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index d6949288ce2..f20145c4ef5 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 3eb271a8bb5..39b659790d0 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index d6ab59448a0..83eda5dcbf9 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-jsp diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 37d267d4c14..ef651cf7d8f 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.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 55a68c0fe93..dd920008467 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-maven-plugin diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index 54c88cb3a98..e8bcf615ab2 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-monitor diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 720668e25ee..54850bce947 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 03abbaa3cf1..53071fecb1a 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index e7e33721f16..aac004a02fa 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index f2a1d005aed..490c4dc28a1 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-proxy diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index daa1fe17e1d..03ad237907e 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 1c4fe9d3114..0883fd88398 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 7a4643e7f02..d551ab44a55 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 70f2af62a88..2f24762a9f2 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 9a6785acd6f..d503d2fac73 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 14c1ec2928e..9d5de75af90 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index d351bed6ceb..0d94bf0a7a5 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 0af3ab1edaf..51a53ac38f3 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index df3606bf8db..a1e501d5386 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 9a7f15f1953..b6f45427853 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index c0cecebdd7d..a201f0aaa68 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 4428c65988a..c2975ebd000 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 07e52e698b9..26c02b999b6 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 873e2721ef9..e0fb01f9245 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.5-SNAPSHOT + 9.0.4-SNAPSHOT 4.0.0 jetty-xml From 57c6199e3b615e80954303ecd2414a7fa84e8db9 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 25 Jun 2013 08:07:05 -0700 Subject: [PATCH 24/29] Updating VERSION.txt top section --- VERSION.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 4ef49576bf3..a2146beb72a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,4 @@ -jetty-9.0.4.v20130621 - 21 June 2013 +jetty-9.0.4.v20130625 - 25 June 2013 + 396706 CGI support parameters + 397051 Make JDBCLoginService data members protected to facilitate subclassing @@ -129,6 +129,8 @@ jetty-9.0.4.v20130621 - 21 June 2013 + 411135 HttpClient may send proxied https requests to the proxy instead of the target server. + 411340 add comment why executeOnFillable defaults to true + + 411545 SslConnection.DecryptedEndpoint.fill() sometimes misses a few network + bytes jetty-9.0.3.v20130506 - 06 May 2013 + 404010 fix cast exception in mongodb session manager From 5f2c937fcb92991ccc510735699c0fe36ba7bef2 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 25 Jun 2013 08:29:18 -0700 Subject: [PATCH 25/29] [maven-release-plugin] prepare release jetty-9.0.4.v20130625 --- aggregates/jetty-all/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-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/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-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/jetty-osgi-npn/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-overlay-deployer/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/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-client/pom.xml | 2 +- jetty-spdy/spdy-core/pom.xml | 2 +- jetty-spdy/spdy-example-webapp/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/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-loginservice/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-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-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 +- 78 files changed, 78 insertions(+), 78 deletions(-) diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index fa9262c91c4..50bc798093b 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 ../../pom.xml 4.0.0 diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index a19d752f3ac..7fb99d52c43 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 4a02ff92120..9a2cc07f608 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 org.eclipse.jetty.example-async-rest diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index e88cde949b8..7b6e6eb8488 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130625 ../pom.xml 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 0f30afe56f3..10b504de447 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130625 ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 1bda41bc19e..8cb0f8d5fc9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 ../pom.xml org.eclipse.jetty.examples diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 13e2194554a..cbeaee2937a 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 01fe3ea3fb2..703d578ef4f 100755 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-ant diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 4ba11e2cf74..1442799f062 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index f71dc603ea5..ad9e025c6a9 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 4ea462a633d..3362d1887dd 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 5aff528e629..1cf5e9c6819 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index bbf3d08ab63..be90129e9ee 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index a9a4ed7853a..6956436b922 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 318f67e40bf..226e26c109e 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 71728a363cd..cdcfe50c4b7 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index f20145c4ef5..5907ad05a49 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 39b659790d0..91dab0d92ef 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-jndi diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 83eda5dcbf9..1bfdc906200 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-jsp diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index ef651cf7d8f..526314d369a 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index dd920008467..35e7d2dc28d 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-maven-plugin diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index e8bcf615ab2..fb9a4483e8e 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-monitor diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 54850bce947..f394f5ff3f7 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-nosql diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 29a346103a7..07e3d33992d 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 b853eb80c9e..be2f56d085e 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.0.4-SNAPSHOT + 9.0.4.v20130625 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index d5ba5960526..28cb7c22c62 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 df9b6c586ae..f8c2e9dce1d 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-httpservice diff --git a/jetty-osgi/jetty-osgi-npn/pom.xml b/jetty-osgi/jetty-osgi-npn/pom.xml index a625bcc468a..b4b4ffad7aa 100644 --- a/jetty-osgi/jetty-osgi-npn/pom.xml +++ b/jetty-osgi/jetty-osgi-npn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-osgi-npn diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index f9a021d8a3e..0ffffe97808 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 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 86c24d4b559..af578f66fcb 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 14ad31c49d6..2a176da146d 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.0.4-SNAPSHOT + 9.0.4.v20130625 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index e4cd558238b..993a7beccaa 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.0.4-SNAPSHOT + 9.0.4.v20130625 ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 53071fecb1a..3f53166d577 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index aac004a02fa..99ef99935ba 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 490c4dc28a1..7c818c7e0a2 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-proxy diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 03ad237907e..ded62c0b0b4 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 0883fd88398..186872575f4 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 org.eclipse.jetty diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index d551ab44a55..df063c79745 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 2f24762a9f2..7ef7607dd34 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index d503d2fac73..d5d6140f23e 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 9d5de75af90..4ef680a698a 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-servlets diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index 0d94bf0a7a5..581a33049ae 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml index a2ec7b0e583..c8e0272b8ad 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index 858427eb2a7..11110f38dd9 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml index 924536d62b3..3dbaf4838e0 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 spdy-example-webapp diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml index 922099ed5f5..b8d145241a8 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 spdy-http-server diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml index 63175046b0c..a4eb7c26768 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 51a53ac38f3..1236aa7c66f 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index a1e501d5386..40acd9c96cb 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-start diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index b6f45427853..f11da3facda 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index a201f0aaa68..5fca18fbc1a 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index c2975ebd000..d7a919e3d55 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 26c02b999b6..629af9a24ae 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 3980f625872..86a1bbc9898 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index f8822d88b09..319f10a921b 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index 5d95b151e50..048fca9e387 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index a2551bdf1e5..9a8cfffb55e 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 93dc564985f..cbb8b804a33 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.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index e0fb01f9245..dc5737e423b 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index f40e7e76c0c..ead25b54d7e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 20 jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 Jetty :: Project http://www.eclipse.org/jetty pom diff --git a/tests/pom.xml b/tests/pom.xml index 920b69b5afd..37c513a2812 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.4-SNAPSHOT + 9.0.4.v20130625 ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index 936f4a1abf1..d24085fc8b7 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130625 ../pom.xml 4.0.0 diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 7ba45e0b92e..55356f8fb9f 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130625 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 9330be8282d..e86f33397de 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130625 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 a78216c8b49..0f2f6ca34b9 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 91c24996d55..24ee74583e9 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.0.4-SNAPSHOT + 9.0.4.v20130625 test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index d72d95fb821..da957126b2d 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.0.4-SNAPSHOT + 9.0.4.v20130625 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index cea8290cd16..6e33ad18ca1 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4-SNAPSHOT + 9.0.4.v20130625 ../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 5b7b6d95438..7db60833d21 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 f13b5f27720..2ed5de88a00 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.0.4-SNAPSHOT + 9.0.4.v20130625 ../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 08dbf69462d..b0c4912c25e 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 6aa8b94d365..8c4763afa1b 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 cd27f69a0c5..71202bd4349 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.0.4-SNAPSHOT + 9.0.4.v20130625 ../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 dae132153a3..3d79bcd7755 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 8146e3e89ef..e046202ca93 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 0859a289198..f799275ed22 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 bf6f03bc7a4..eb6127b29d5 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.0.4-SNAPSHOT + 9.0.4.v20130625 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 2243dac04b5..085549bd751 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.0.4-SNAPSHOT + 9.0.4.v20130625 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 78b5f7df1fd491deec4fa86188eb386bf52954c2 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 25 Jun 2013 08:29:26 -0700 Subject: [PATCH 26/29] [maven-release-plugin] prepare for next development iteration --- aggregates/jetty-all/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-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/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-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/jetty-osgi-npn/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-overlay-deployer/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/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-client/pom.xml | 2 +- jetty-spdy/spdy-core/pom.xml | 2 +- jetty-spdy/spdy-example-webapp/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/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-loginservice/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-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-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 +- 78 files changed, 78 insertions(+), 78 deletions(-) diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 50bc798093b..b7a23e96d64 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index 7fb99d52c43..9a6c6e8acb3 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.0.4.v20130625 + 9.0.5-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 9a2cc07f608..3e3d48dc6bb 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.0.4.v20130625 + 9.0.5-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 7b6e6eb8488..25f20fcfda3 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.4.v20130625 + 9.0.5-SNAPSHOT ../pom.xml 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 10b504de447..80d165662a4 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.0.4.v20130625 + 9.0.5-SNAPSHOT ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 8cb0f8d5fc9..e311e4d9465 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT ../pom.xml org.eclipse.jetty.examples diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index cbeaee2937a..122641b2c6a 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 703d578ef4f..d75604169f1 100755 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-ant diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 1442799f062..cfa10eb3ad2 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index ad9e025c6a9..047c8f293bc 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 3362d1887dd..fc174140bbf 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 1cf5e9c6819..eebc1d395b4 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index be90129e9ee..e8de81ef116 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 6956436b922..3da554a4c9a 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 226e26c109e..d84da94c271 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index cdcfe50c4b7..414e03b51ef 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 5907ad05a49..d6949288ce2 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 91dab0d92ef..3eb271a8bb5 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 1bfdc906200..d6ab59448a0 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-jsp diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 526314d369a..37d267d4c14 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 35e7d2dc28d..55a68c0fe93 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-maven-plugin diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index fb9a4483e8e..54c88cb3a98 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-monitor diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index f394f5ff3f7..720668e25ee 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 07e3d33992d..ef649226ea6 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.0.4.v20130625 + 9.0.5-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 be2f56d085e..60eb08b5006 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.0.4.v20130625 + 9.0.5-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 28cb7c22c62..be8b6f49408 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.0.4.v20130625 + 9.0.5-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 f8c2e9dce1d..e7fcc7528f9 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-httpservice diff --git a/jetty-osgi/jetty-osgi-npn/pom.xml b/jetty-osgi/jetty-osgi-npn/pom.xml index b4b4ffad7aa..de04a5c5f6f 100644 --- a/jetty-osgi/jetty-osgi-npn/pom.xml +++ b/jetty-osgi/jetty-osgi-npn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-osgi-npn diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 0ffffe97808..29826d2fc45 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-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 af578f66fcb..b180cb7df25 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.0.4.v20130625 + 9.0.5-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 2a176da146d..31a2c39b6ce 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.0.4.v20130625 + 9.0.5-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 993a7beccaa..9120a43a3f9 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.0.4.v20130625 + 9.0.5-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 3f53166d577..03abbaa3cf1 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 99ef99935ba..e7e33721f16 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 7c818c7e0a2..f2a1d005aed 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-proxy diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index ded62c0b0b4..daa1fe17e1d 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 186872575f4..1c4fe9d3114 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index df063c79745..7a4643e7f02 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 7ef7607dd34..70f2af62a88 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index d5d6140f23e..9a6785acd6f 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 4ef680a698a..14c1ec2928e 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index 581a33049ae..d351bed6ceb 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml index c8e0272b8ad..7e4923454f8 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index 11110f38dd9..60df8ab8e84 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml index 3dbaf4838e0..d2df0aaa9d3 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 spdy-example-webapp diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml index b8d145241a8..af9bb4d2509 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 spdy-http-server diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml index a4eb7c26768..699a2e1bf7f 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 1236aa7c66f..0af3ab1edaf 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 40acd9c96cb..df3606bf8db 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index f11da3facda..9a7f15f1953 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 5fca18fbc1a..c0cecebdd7d 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index d7a919e3d55..4428c65988a 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 629af9a24ae..07e52e698b9 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 86a1bbc9898..e24e073f012 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index 319f10a921b..8036f8ef5a4 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index 048fca9e387..cf0ca81a4d1 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index 9a8cfffb55e..a2bae1ec042 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index cbb8b804a33..a8e1d7ebb38 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.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index dc5737e423b..873e2721ef9 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index ead25b54d7e..aebaa96269e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 20 jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT Jetty :: Project http://www.eclipse.org/jetty pom diff --git a/tests/pom.xml b/tests/pom.xml index 37c513a2812..ecf5c4e0c8f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 9.0.4.v20130625 + 9.0.5-SNAPSHOT ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index d24085fc8b7..36dfbf80626 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4.v20130625 + 9.0.5-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 55356f8fb9f..cc472957b70 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4.v20130625 + 9.0.5-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index e86f33397de..aedc181b052 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4.v20130625 + 9.0.5-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 0f2f6ca34b9..e0fce942e14 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.0.4.v20130625 + 9.0.5-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 24ee74583e9..0513c4e821b 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.0.4.v20130625 + 9.0.5-SNAPSHOT test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index da957126b2d..f0d4a03fd80 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.0.4.v20130625 + 9.0.5-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 6e33ad18ca1..fc232ded383 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 9.0.4.v20130625 + 9.0.5-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 7db60833d21..1836e487eee 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.0.4.v20130625 + 9.0.5-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 2ed5de88a00..477a5f703e1 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.0.4.v20130625 + 9.0.5-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 b0c4912c25e..2f5c2f0728c 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.0.4.v20130625 + 9.0.5-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 8c4763afa1b..f07097dbe59 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.0.4.v20130625 + 9.0.5-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 71202bd4349..2b71367f759 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.0.4.v20130625 + 9.0.5-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 3d79bcd7755..031f2fce86a 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.0.4.v20130625 + 9.0.5-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 e046202ca93..54da2e83181 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.0.4.v20130625 + 9.0.5-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 f799275ed22..44344dd4c68 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.0.4.v20130625 + 9.0.5-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 eb6127b29d5..abef5923f88 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.0.4.v20130625 + 9.0.5-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 085549bd751..433b97a7001 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.0.4.v20130625 + 9.0.5-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 67fd1e496fb7e7ef0afcdca181419d9fde1948b7 Mon Sep 17 00:00:00 2001 From: Thomas Becker Date: Mon, 24 Jun 2013 16:20:03 +0200 Subject: [PATCH 27/29] 410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway --- .../java/org/eclipse/jetty/spdy/client/SPDYConnection.java | 2 +- .../test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java index b77b9d6e548..c56210fbe21 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java @@ -62,7 +62,7 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id // // Due to a jvm bug we've had a Selector thread being stuck at // sun.nio.ch.FileDispatcherImpl.preClose0(Native Method). That's why we now default executeOnFillable to - // true even if for most use cases it is faster to not dispatch the IO events. + // true even if for most use cases it is faster to not dispatch the IO events. super(endPoint, executor, executeOnFillable); this.bufferPool = bufferPool; this.parser = parser; diff --git a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java index 9a4b3f35d9b..5e8e301db0d 100644 --- a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java +++ b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/GoAwayTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.eclipse.jetty.io.EofException; import org.eclipse.jetty.spdy.api.DataInfo; import org.eclipse.jetty.spdy.api.GoAwayInfo; import org.eclipse.jetty.spdy.api.GoAwayResultInfo; @@ -41,7 +40,6 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Fields; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.FuturePromise; -import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; @@ -223,7 +221,8 @@ public class GoAwayTest extends AbstractTest } catch (ExecutionException x) { - Assert.assertThat(x.getCause(), CoreMatchers.instanceOf(EofException.class)); + // doesn't matter which exception we get, it's important that the data is not been written and the + // previous assertion is true } // The last good stream is the second, because it was received by the server From e1d6329b029db4076de86327a0a728ea4a145db8 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 25 Jun 2013 09:14:31 -0700 Subject: [PATCH 28/29] Cherry picking GoAwayTest fix --- VERSION.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/VERSION.txt b/VERSION.txt index a2146beb72a..4174044d32a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -106,6 +106,7 @@ jetty-9.0.4.v20130625 - 25 June 2013 + 410405 Avoid NPE for requestDispatcher(../) + 410469 UpgradeRequest is sent twice when using SSL, one fails warning about WritePendingException + + 410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway + 410522 jetty start broken for command line options + 410537 Exceptions during @OnWebSocketConnect not reported to @OnWebSocketError From bf3e6a4a53502d47dc1fe4353ea57e172a9c833d Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 25 Jun 2013 16:35:16 -0700 Subject: [PATCH 29/29] Updating VERSION.txt top section --- VERSION.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/VERSION.txt b/VERSION.txt index 4174044d32a..f0c380b37f3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-9.0.5-SNAPSHOT + jetty-9.0.4.v20130625 - 25 June 2013 + 396706 CGI support parameters + 397051 Make JDBCLoginService data members protected to facilitate