From 26d12b9c2d7ea59716e36a24a8d783a74436d004 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 14 Jan 2020 14:52:44 +1100 Subject: [PATCH 01/11] Issue #4475 - proof of concept Signed-off-by: Lachlan Roberts --- .../endpoints/JsrEndpointEventDriver.java | 20 +++++- .../jsr356/server/TextStreamTest.java | 64 ++++++++++++++++++- 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java index ac54bc47c4a..a260265f880 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java @@ -23,6 +23,7 @@ import java.io.InputStream; import java.io.Reader; import java.nio.ByteBuffer; import java.util.Map; +import java.util.concurrent.CountDownLatch; import javax.websocket.CloseReason; import javax.websocket.Endpoint; import javax.websocket.MessageHandler; @@ -190,7 +191,23 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver } else if (wrapper.wantsStreams()) { - final MessageReader stream = new MessageReader(new MessageInputStream()); + final CountDownLatch completed = new CountDownLatch(1); + final MessageReader stream = new MessageReader(new MessageInputStream()) + { + @Override + public void messageComplete() + { + super.messageComplete(); + try + { + completed.await(); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + }; activeMessage = stream; dispatch(new Runnable() @@ -201,6 +218,7 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver { MessageHandler.Whole handler = (Whole)wrapper.getHandler(); handler.onMessage(stream); + completed.countDown(); } }); } diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java index b555e316531..d241fd4d4a4 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java @@ -23,10 +23,14 @@ import java.io.Reader; import java.io.Writer; import java.net.URI; import java.util.Random; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javax.websocket.ClientEndpoint; import javax.websocket.ContainerProvider; +import javax.websocket.Endpoint; +import javax.websocket.EndpointConfig; +import javax.websocket.MessageHandler; import javax.websocket.OnMessage; import javax.websocket.Session; import javax.websocket.WebSocketContainer; @@ -36,11 +40,15 @@ import javax.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.util.BlockingArrayQueue; +import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer; +import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -49,6 +57,8 @@ public class TextStreamTest private static final String PATH = "/echo"; private static final String CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + private static CompletableFuture queuedTextStreamerFuture = new CompletableFuture<>(); + private Server server; private ServerConnector connector; private WebSocketContainer wsClient; @@ -62,8 +72,8 @@ public class TextStreamTest ServletContextHandler context = new ServletContextHandler(server, "/", true, false); ServerContainer container = WebSocketServerContainerInitializer.configureContext(context); - ServerEndpointConfig config = ServerEndpointConfig.Builder.create(ServerTextStreamer.class, PATH).build(); - container.addEndpoint(config); + container.addEndpoint(ServerEndpointConfig.Builder.create(ServerTextStreamer.class, PATH).build()); + container.addEndpoint(ServerEndpointConfig.Builder.create(QueuedTextStreamer.class, "/test").build()); server.start(); @@ -125,6 +135,26 @@ public class TextStreamTest assertArrayEquals(data, client.getEcho()); } + @Test + public void test() throws Exception + { + URI uri = URI.create("ws://localhost:" + connector.getLocalPort() + "/test"); + ClientTextStreamer client = new ClientTextStreamer(); + Session session = wsClient.connectToServer(client, uri); + + final int numLoops = 20; + for (int i = 0; i < numLoops; i++) + session.getBasicRemote().sendText(Integer.toString(i)); + session.close(); + + QueuedTextStreamer queuedTextStreamer = queuedTextStreamerFuture.get(5, TimeUnit.SECONDS); + for (int i = 0; i < numLoops; i++) + { + String msg = queuedTextStreamer.messages.poll(5, TimeUnit.SECONDS); + assertThat(msg, Matchers.is(Integer.toString(i))); + } + } + private char[] randomChars(int size) { char[] data = new char[size]; @@ -183,4 +213,34 @@ public class TextStreamTest } } } + + public static class QueuedTextStreamer extends Endpoint implements MessageHandler.Whole + { + private BlockingArrayQueue messages = new BlockingArrayQueue<>(); + + public QueuedTextStreamer() + { + queuedTextStreamerFuture.complete(this); + } + + @Override + public void onOpen(Session session, EndpointConfig config) + { + session.addMessageHandler(this); + } + + @Override + public void onMessage(Reader input) + { + try + { + Thread.sleep(Math.abs(new Random().nextLong() % 200)); + messages.add(IO.toString(input)); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + } } From 16c406b55c5ca16ab7a1a236cd93adea72dd2f9e Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 14 Jan 2020 15:15:56 +1100 Subject: [PATCH 02/11] Issue #4475 - add test for fragmented frames Signed-off-by: Lachlan Roberts --- .../jsr356/server/TextStreamTest.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java index d241fd4d4a4..f8418f79927 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java @@ -155,6 +155,31 @@ public class TextStreamTest } } + @Test + public void testFragmented() throws Exception + { + URI uri = URI.create("ws://localhost:" + connector.getLocalPort() + "/test"); + ClientTextStreamer client = new ClientTextStreamer(); + Session session = wsClient.connectToServer(client, uri); + + final int numLoops = 20; + for (int i = 0; i < numLoops; i++) + { + session.getBasicRemote().sendText("firstFrame" + i, false); + session.getBasicRemote().sendText("|secondFrame" + i, false); + session.getBasicRemote().sendText("|finalFrame" + i, true); + } + session.close(); + + QueuedTextStreamer queuedTextStreamer = queuedTextStreamerFuture.get(5, TimeUnit.SECONDS); + for (int i = 0; i < numLoops; i++) + { + String msg = queuedTextStreamer.messages.poll(5, TimeUnit.SECONDS); + String expected = "firstFrame" + i + "|secondFrame" + i + "|finalFrame" + i; + assertThat(msg, Matchers.is(expected)); + } + } + private char[] randomChars(int size) { char[] data = new char[size]; From c7b6ccca98e577948e44329ba69c6a2b23d2cb2f Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 14 Jan 2020 19:14:48 +1100 Subject: [PATCH 03/11] Issue #4475 - add tests not reading until EOF Signed-off-by: Lachlan Roberts --- .../jsr356/server/TextStreamTest.java | 72 ++++++++++++++++--- 1 file changed, 63 insertions(+), 9 deletions(-) diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java index f8418f79927..dc9750caa74 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TextStreamTest.java @@ -20,10 +20,10 @@ package org.eclipse.jetty.websocket.jsr356.server; import java.io.IOException; import java.io.Reader; +import java.io.StringWriter; import java.io.Writer; import java.net.URI; import java.util.Random; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javax.websocket.ClientEndpoint; @@ -50,14 +50,14 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; public class TextStreamTest { private static final String PATH = "/echo"; private static final String CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - - private static CompletableFuture queuedTextStreamerFuture = new CompletableFuture<>(); + private static final BlockingArrayQueue serverEndpoints = new BlockingArrayQueue<>(); private Server server; private ServerConnector connector; @@ -74,6 +74,7 @@ public class TextStreamTest ServerContainer container = WebSocketServerContainerInitializer.configureContext(context); container.addEndpoint(ServerEndpointConfig.Builder.create(ServerTextStreamer.class, PATH).build()); container.addEndpoint(ServerEndpointConfig.Builder.create(QueuedTextStreamer.class, "/test").build()); + container.addEndpoint(ServerEndpointConfig.Builder.create(QueuedPartialTextStreamer.class, "/partial").build()); server.start(); @@ -136,7 +137,7 @@ public class TextStreamTest } @Test - public void test() throws Exception + public void testMessageOrdering() throws Exception { URI uri = URI.create("ws://localhost:" + connector.getLocalPort() + "/test"); ClientTextStreamer client = new ClientTextStreamer(); @@ -147,7 +148,8 @@ public class TextStreamTest session.getBasicRemote().sendText(Integer.toString(i)); session.close(); - QueuedTextStreamer queuedTextStreamer = queuedTextStreamerFuture.get(5, TimeUnit.SECONDS); + QueuedTextStreamer queuedTextStreamer = serverEndpoints.poll(5, TimeUnit.SECONDS); + assertNotNull(queuedTextStreamer); for (int i = 0; i < numLoops; i++) { String msg = queuedTextStreamer.messages.poll(5, TimeUnit.SECONDS); @@ -156,7 +158,7 @@ public class TextStreamTest } @Test - public void testFragmented() throws Exception + public void testFragmentedMessageOrdering() throws Exception { URI uri = URI.create("ws://localhost:" + connector.getLocalPort() + "/test"); ClientTextStreamer client = new ClientTextStreamer(); @@ -171,7 +173,8 @@ public class TextStreamTest } session.close(); - QueuedTextStreamer queuedTextStreamer = queuedTextStreamerFuture.get(5, TimeUnit.SECONDS); + QueuedTextStreamer queuedTextStreamer = serverEndpoints.poll(5, TimeUnit.SECONDS); + assertNotNull(queuedTextStreamer); for (int i = 0; i < numLoops; i++) { String msg = queuedTextStreamer.messages.poll(5, TimeUnit.SECONDS); @@ -180,6 +183,29 @@ public class TextStreamTest } } + @Test + public void testMessageOrderingDoNotReadToEOF() throws Exception + { + URI uri = URI.create("ws://localhost:" + connector.getLocalPort() + "/partial"); + ClientTextStreamer client = new ClientTextStreamer(); + Session session = wsClient.connectToServer(client, uri); + + final int numLoops = 20; + for (int i = 0; i < numLoops; i++) + { + session.getBasicRemote().sendText(i + "|-----"); + } + session.close(); + + QueuedTextStreamer queuedTextStreamer = serverEndpoints.poll(5, TimeUnit.SECONDS); + assertNotNull(queuedTextStreamer); + for (int i = 0; i < numLoops; i++) + { + String msg = queuedTextStreamer.messages.poll(5, TimeUnit.SECONDS); + assertThat(msg, Matchers.is(Integer.toString(i))); + } + } + private char[] randomChars(int size) { char[] data = new char[size]; @@ -241,11 +267,11 @@ public class TextStreamTest public static class QueuedTextStreamer extends Endpoint implements MessageHandler.Whole { - private BlockingArrayQueue messages = new BlockingArrayQueue<>(); + protected BlockingArrayQueue messages = new BlockingArrayQueue<>(); public QueuedTextStreamer() { - queuedTextStreamerFuture.complete(this); + serverEndpoints.add(this); } @Override @@ -268,4 +294,32 @@ public class TextStreamTest } } } + + public static class QueuedPartialTextStreamer extends QueuedTextStreamer + { + @Override + public void onMessage(Reader input) + { + try + { + Thread.sleep(Math.abs(new Random().nextLong() % 200)); + + // Do not read to EOF but just the first '|'. + StringWriter writer = new StringWriter(); + while (true) + { + int read = input.read(); + if (read < 0 || read == '|') + break; + writer.write(read); + } + + messages.add(writer.toString()); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + } } From 3fd7094c01d453d658494c6ae693201c6af69d03 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 17 Jan 2020 13:11:48 +1100 Subject: [PATCH 04/11] Issue #4475 - suspend/resume to control reading frames while streaming Signed-off-by: Lachlan Roberts --- .../endpoints/JsrAnnotatedEventDriver.java | 52 ++++--- .../endpoints/JsrEndpointEventDriver.java | 60 ++++---- .../events/JettyAnnotatedEventDriver.java | 51 ++++--- .../common/message/MessageInputStream.java | 113 +++++++++------ .../common/message/EmptySession.java | 129 ++++++++++++++++++ .../message/MessageInputStreamTest.java | 12 +- 6 files changed, 276 insertions(+), 141 deletions(-) create mode 100644 jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/EmptySession.java diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java index 4adae003115..4f2369e3a01 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java @@ -116,27 +116,24 @@ public class JsrAnnotatedEventDriver extends AbstractJsrEventDriver if (activeMessage == null) { if (LOG.isDebugEnabled()) - { LOG.debug("Binary Message InputStream"); - } - final MessageInputStream stream = new MessageInputStream(); + + final MessageInputStream stream = new MessageInputStream(session); activeMessage = stream; // Always dispatch streaming read to another thread. - dispatch(new Runnable() + dispatch(() -> { - @Override - public void run() + try { - try - { - events.callBinaryStream(jsrsession.getAsyncRemote(), websocket, stream); - } - catch (Throwable e) - { - onFatalError(e); - } + events.callBinaryStream(jsrsession.getAsyncRemote(), websocket, stream); } + catch (Throwable e) + { + session.close(e); + } + + stream.close(); }); } } @@ -330,28 +327,25 @@ public class JsrAnnotatedEventDriver extends AbstractJsrEventDriver if (activeMessage == null) { if (LOG.isDebugEnabled()) - { LOG.debug("Text Message Writer"); - } - final MessageReader stream = new MessageReader(new MessageInputStream()); - activeMessage = stream; + MessageInputStream inputStream = new MessageInputStream(session); + final MessageReader reader = new MessageReader(inputStream); + activeMessage = inputStream; // Always dispatch streaming read to another thread. - dispatch(new Runnable() + dispatch(() -> { - @Override - public void run() + try { - try - { - events.callTextStream(jsrsession.getAsyncRemote(), websocket, stream); - } - catch (Throwable e) - { - onFatalError(e); - } + events.callTextStream(jsrsession.getAsyncRemote(), websocket, reader); } + catch (Throwable e) + { + session.close(e); + } + + inputStream.close(); }); } } diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java index a260265f880..4dc9f01272b 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java @@ -23,7 +23,6 @@ import java.io.InputStream; import java.io.Reader; import java.nio.ByteBuffer; import java.util.Map; -import java.util.concurrent.CountDownLatch; import javax.websocket.CloseReason; import javax.websocket.Endpoint; import javax.websocket.MessageHandler; @@ -88,17 +87,22 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver } else if (wrapper.wantsStreams()) { - final MessageInputStream stream = new MessageInputStream(); - activeMessage = stream; - dispatch(new Runnable() + @SuppressWarnings("unchecked") + MessageHandler.Whole handler = (Whole)wrapper.getHandler(); + MessageInputStream inputStream = new MessageInputStream(session); + activeMessage = inputStream; + dispatch(() -> { - @SuppressWarnings("unchecked") - @Override - public void run() + try { - MessageHandler.Whole handler = (Whole)wrapper.getHandler(); - handler.onMessage(stream); + handler.onMessage(inputStream); } + catch (Throwable t) + { + session.close(t); + } + + inputStream.close(); }); } else @@ -191,35 +195,23 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver } else if (wrapper.wantsStreams()) { - final CountDownLatch completed = new CountDownLatch(1); - final MessageReader stream = new MessageReader(new MessageInputStream()) + @SuppressWarnings("unchecked") + MessageHandler.Whole handler = (Whole)wrapper.getHandler(); + MessageInputStream inputStream = new MessageInputStream(session); + MessageReader reader = new MessageReader(inputStream); + activeMessage = reader; + dispatch(() -> { - @Override - public void messageComplete() + try { - super.messageComplete(); - try - { - completed.await(); - } - catch (Exception e) - { - throw new RuntimeException(e); - } + handler.onMessage(reader); + } + catch (Throwable t) + { + session.close(t); } - }; - activeMessage = stream; - dispatch(new Runnable() - { - @SuppressWarnings("unchecked") - @Override - public void run() - { - MessageHandler.Whole handler = (Whole)wrapper.getHandler(); - handler.onMessage(stream); - completed.countDown(); - } + inputStream.close(); }); } else diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java index 6958bdd0526..cb993d213d0 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java @@ -97,23 +97,21 @@ public class JettyAnnotatedEventDriver extends AbstractEventDriver { if (events.onBinary.isStreaming()) { - activeMessage = new MessageInputStream(); - final MessageAppender msg = activeMessage; - dispatch(new Runnable() + final MessageInputStream inputStream = new MessageInputStream(session); + activeMessage = inputStream; + dispatch(() -> { - @Override - public void run() + try { - try - { - events.onBinary.call(websocket, session, msg); - } - catch (Throwable t) - { - // dispatched calls need to be reported - onError(t); - } + events.onBinary.call(websocket, session, inputStream); } + catch (Throwable t) + { + // dispatched calls need to be reported + session.close(t); + } + + inputStream.close(); }); } else @@ -215,23 +213,22 @@ public class JettyAnnotatedEventDriver extends AbstractEventDriver { if (events.onText.isStreaming()) { - activeMessage = new MessageReader(new MessageInputStream()); + MessageInputStream inputStream = new MessageInputStream(session); + activeMessage = new MessageReader(inputStream); final MessageAppender msg = activeMessage; - dispatch(new Runnable() + dispatch(() -> { - @Override - public void run() + try { - try - { - events.onText.call(websocket, session, msg); - } - catch (Throwable t) - { - // dispatched calls need to be reported - onError(t); - } + events.onText.call(websocket, session, msg); } + catch (Throwable t) + { + // dispatched calls need to be reported + session.close(t); + } + + inputStream.close(); }); } else diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java index d61d53b9ac1..a40c9ee628c 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java @@ -24,11 +24,14 @@ import java.nio.ByteBuffer; import java.util.concurrent.BlockingDeque; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; +import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; 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.api.SuspendToken; +import org.eclipse.jetty.websocket.common.WebSocketSession; /** * Support class for reading a (single) WebSocket BINARY message via a InputStream. @@ -40,63 +43,59 @@ public class MessageInputStream extends InputStream implements MessageAppender private static final Logger LOG = Log.getLogger(MessageInputStream.class); private static final ByteBuffer EOF = ByteBuffer.allocate(0).asReadOnlyBuffer(); + private final Session session; + private final ByteBufferPool bufferPool; private final BlockingDeque buffers = new LinkedBlockingDeque<>(); - private AtomicBoolean closed = new AtomicBoolean(false); private final long timeoutMs; private ByteBuffer activeBuffer = null; + private volatile boolean closed = false; + private volatile SuspendToken suspendToken; - private static boolean isTheEofBuffer(ByteBuffer buf) + public MessageInputStream(Session session) { - @SuppressWarnings("ReferenceEquality") - boolean isTheEofBuffer = (buf == EOF); - return isTheEofBuffer; + this(session, -1); } - public MessageInputStream() - { - this(-1); - } - - public MessageInputStream(int timeoutMs) + public MessageInputStream(Session session, int timeoutMs) { this.timeoutMs = timeoutMs; + this.session = session; + this.bufferPool = (session instanceof WebSocketSession) ? ((WebSocketSession)session).getBufferPool() : null; + this.suspendToken = session.suspend(); } @Override public void appendFrame(ByteBuffer framePayload, boolean fin) throws IOException { if (LOG.isDebugEnabled()) - { LOG.debug("Appending {} chunk: {}", fin ? "final" : "non-final", BufferUtil.toDetailString(framePayload)); - } // If closed, we should just toss incoming payloads into the bit bucket. - if (closed.get()) - { + if (closed) return; - } // Put the payload into the queue, by copying it. // Copying is necessary because the payload will // be processed after this method returns. try { - if (framePayload == null) - { - // skip if no payload + if (framePayload == null || !framePayload.hasRemaining()) return; - } - int capacity = framePayload.remaining(); - if (capacity <= 0) + ByteBuffer copy = acquire(framePayload.remaining(), framePayload.isDirect()); + BufferUtil.clearToFill(copy); + copy.put(framePayload); + BufferUtil.flipToFlush(copy, 0); + + synchronized (this) { - // skip if no payload data to copy - return; + if (closed) + return; + + if (suspendToken == null) + suspendToken = session.suspend(); + buffers.put(copy); } - // TODO: the copy buffer should be pooled too, but no buffer pool available from here. - ByteBuffer copy = framePayload.isDirect() ? ByteBuffer.allocateDirect(capacity) : ByteBuffer.allocate(capacity); - copy.put(framePayload).flip(); - buffers.put(copy); } catch (InterruptedException e) { @@ -105,20 +104,32 @@ public class MessageInputStream extends InputStream implements MessageAppender finally { if (fin) - { buffers.offer(EOF); - } } } - @Override - public void close() throws IOException + private ByteBuffer acquire(int capacity, boolean direct) { - if (closed.compareAndSet(false, true)) + ByteBuffer buffer; + if (bufferPool != null) + buffer = bufferPool.acquire(capacity, direct); + else + buffer = direct ? BufferUtil.allocateDirect(capacity) : BufferUtil.allocate(capacity); + return buffer; + } + + @Override + public void close() + { + synchronized (this) { + closed = true; + buffers.clear(); buffers.offer(EOF); - super.close(); } + + // Resume to discard util we reach next message. + resume(); } @Override @@ -146,7 +157,7 @@ public class MessageInputStream extends InputStream implements MessageAppender { try { - if (closed.get()) + if (closed) { if (LOG.isDebugEnabled()) LOG.debug("Stream closed"); @@ -168,34 +179,46 @@ public class MessageInputStream extends InputStream implements MessageAppender // Wait at most for the given timeout. activeBuffer = buffers.poll(timeoutMs, TimeUnit.MILLISECONDS); if (activeBuffer == null) - { throw new IOException(String.format("Read timeout: %,dms expired", timeoutMs)); - } } - if (isTheEofBuffer(activeBuffer)) + if (activeBuffer == EOF) { if (LOG.isDebugEnabled()) LOG.debug("Reached EOF"); - // Be sure that this stream cannot be reused. - closed.set(true); - // Removed buffers that may have remained in the queue. - buffers.clear(); + + close(); return -1; } } - return activeBuffer.get() & 0xFF; + int result = activeBuffer.get() & 0xFF; + if (!activeBuffer.hasRemaining()) + resume(); + + return result; } catch (InterruptedException x) { if (LOG.isDebugEnabled()) LOG.debug("Interrupted while waiting to read", x); - closed.set(true); + close(); return -1; } } + private void resume() + { + SuspendToken resume; + synchronized (this) + { + resume = suspendToken; + suspendToken = null; + } + if (resume != null) + resume.resume(); + } + @Override public void reset() throws IOException { diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/EmptySession.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/EmptySession.java new file mode 100644 index 00000000000..97244fd28e0 --- /dev/null +++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/EmptySession.java @@ -0,0 +1,129 @@ +// +// ======================================================================== +// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.websocket.common.message; + +import java.io.IOException; +import java.net.InetSocketAddress; + +import org.eclipse.jetty.websocket.api.CloseStatus; +import org.eclipse.jetty.websocket.api.RemoteEndpoint; +import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.SuspendToken; +import org.eclipse.jetty.websocket.api.UpgradeRequest; +import org.eclipse.jetty.websocket.api.UpgradeResponse; +import org.eclipse.jetty.websocket.api.WebSocketPolicy; + +public class EmptySession implements Session, SuspendToken +{ + @Override + public void close() + { + } + + @Override + public void close(CloseStatus closeStatus) + { + } + + @Override + public void close(int statusCode, String reason) + { + } + + @Override + public void disconnect() throws IOException + { + } + + @Override + public long getIdleTimeout() + { + return -1; + } + + @Override + public InetSocketAddress getLocalAddress() + { + return null; + } + + @Override + public WebSocketPolicy getPolicy() + { + return null; + } + + @Override + public String getProtocolVersion() + { + return null; + } + + @Override + public RemoteEndpoint getRemote() + { + return null; + } + + @Override + public InetSocketAddress getRemoteAddress() + { + return null; + } + + @Override + public UpgradeRequest getUpgradeRequest() + { + return null; + } + + @Override + public UpgradeResponse getUpgradeResponse() + { + return null; + } + + @Override + public boolean isOpen() + { + return false; + } + + @Override + public boolean isSecure() + { + return false; + } + + @Override + public void setIdleTimeout(long ms) + { + } + + @Override + public SuspendToken suspend() + { + return this; + } + + @Override + public void resume() + { + } +} diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageInputStreamTest.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageInputStreamTest.java index 0c85759dc5b..70c2a7527b6 100644 --- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageInputStreamTest.java +++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageInputStreamTest.java @@ -48,7 +48,7 @@ public class MessageInputStreamTest @Test public void testBasicAppendRead() throws IOException { - try (MessageInputStream stream = new MessageInputStream()) + try (MessageInputStream stream = new MessageInputStream(new EmptySession())) { Assertions.assertTimeoutPreemptively(ofSeconds(5), () -> { @@ -71,7 +71,7 @@ public class MessageInputStreamTest @Test public void testBlockOnRead() throws Exception { - try (MessageInputStream stream = new MessageInputStream()) + try (MessageInputStream stream = new MessageInputStream(new EmptySession())) { final AtomicBoolean hadError = new AtomicBoolean(false); final CountDownLatch startLatch = new CountDownLatch(1); @@ -123,7 +123,7 @@ public class MessageInputStreamTest @Test public void testBlockOnReadInitial() throws IOException { - try (MessageInputStream stream = new MessageInputStream()) + try (MessageInputStream stream = new MessageInputStream(new EmptySession())) { final AtomicBoolean hadError = new AtomicBoolean(false); @@ -163,7 +163,7 @@ public class MessageInputStreamTest @Test public void testReadByteNoBuffersClosed() throws IOException { - try (MessageInputStream stream = new MessageInputStream()) + try (MessageInputStream stream = new MessageInputStream(new EmptySession())) { final AtomicBoolean hadError = new AtomicBoolean(false); @@ -202,7 +202,7 @@ public class MessageInputStreamTest @Test public void testAppendEmptyPayloadRead() throws IOException { - try (MessageInputStream stream = new MessageInputStream()) + try (MessageInputStream stream = new MessageInputStream(new EmptySession())) { Assertions.assertTimeoutPreemptively(ofSeconds(10), () -> { @@ -229,7 +229,7 @@ public class MessageInputStreamTest @Test public void testAppendNullPayloadRead() throws IOException { - try (MessageInputStream stream = new MessageInputStream()) + try (MessageInputStream stream = new MessageInputStream(new EmptySession())) { Assertions.assertTimeoutPreemptively(ofSeconds(10), () -> { From 3d309a57973935aac3cb9dd63fd150aa6f90a5a2 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 17 Jan 2020 18:37:20 +1100 Subject: [PATCH 05/11] Issue #4475 - use state machine for MessageInputStream Signed-off-by: Lachlan Roberts --- .../common/message/MessageInputStream.java | 121 ++++++++++++------ 1 file changed, 80 insertions(+), 41 deletions(-) diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java index a40c9ee628c..346076dd0ec 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java @@ -48,8 +48,15 @@ public class MessageInputStream extends InputStream implements MessageAppender private final BlockingDeque buffers = new LinkedBlockingDeque<>(); private final long timeoutMs; private ByteBuffer activeBuffer = null; - private volatile boolean closed = false; - private volatile SuspendToken suspendToken; + private SuspendToken suspendToken; + private State state = State.RESUMED; + + private enum State + { + RESUMED, + SUSPENDED, + CLOSED + } public MessageInputStream(Session session) { @@ -61,7 +68,6 @@ public class MessageInputStream extends InputStream implements MessageAppender this.timeoutMs = timeoutMs; this.session = session; this.bufferPool = (session instanceof WebSocketSession) ? ((WebSocketSession)session).getBufferPool() : null; - this.suspendToken = session.suspend(); } @Override @@ -70,8 +76,8 @@ public class MessageInputStream extends InputStream implements MessageAppender if (LOG.isDebugEnabled()) LOG.debug("Appending {} chunk: {}", fin ? "final" : "non-final", BufferUtil.toDetailString(framePayload)); - // If closed, we should just toss incoming payloads into the bit bucket. - if (closed) + // Early non atomic test that we aren't closed to avoid an unnecessary copy (will be checked again later). + if (state == State.CLOSED) return; // Put the payload into the queue, by copying it. @@ -89,11 +95,20 @@ public class MessageInputStream extends InputStream implements MessageAppender synchronized (this) { - if (closed) - return; + switch (state) + { + case CLOSED: + return; + + case RESUMED: + suspendToken = session.suspend(); + state = State.SUSPENDED; + break; + + case SUSPENDED: + throw new IllegalStateException(); + } - if (suspendToken == null) - suspendToken = session.suspend(); buffers.put(copy); } } @@ -101,35 +116,37 @@ public class MessageInputStream extends InputStream implements MessageAppender { throw new IOException(e); } - finally - { - if (fin) - buffers.offer(EOF); - } - } - - private ByteBuffer acquire(int capacity, boolean direct) - { - ByteBuffer buffer; - if (bufferPool != null) - buffer = bufferPool.acquire(capacity, direct); - else - buffer = direct ? BufferUtil.allocateDirect(capacity) : BufferUtil.allocate(capacity); - return buffer; } @Override public void close() { + SuspendToken resume = null; synchronized (this) { - closed = true; + switch (state) + { + case CLOSED: + return; + + case SUSPENDED: + resume = suspendToken; + suspendToken = null; + state = State.CLOSED; + break; + + case RESUMED: + state = State.CLOSED; + break; + } + buffers.clear(); buffers.offer(EOF); } - // Resume to discard util we reach next message. - resume(); + // May need to resume to discard until we reach next message. + if (resume != null) + resume.resume(); } @Override @@ -157,7 +174,7 @@ public class MessageInputStream extends InputStream implements MessageAppender { try { - if (closed) + if (state == State.CLOSED) { if (LOG.isDebugEnabled()) LOG.debug("Stream closed"); @@ -194,7 +211,31 @@ public class MessageInputStream extends InputStream implements MessageAppender int result = activeBuffer.get() & 0xFF; if (!activeBuffer.hasRemaining()) - resume(); + { + + SuspendToken resume = null; + synchronized (this) + { + switch (state) + { + case CLOSED: + return -1; + + case SUSPENDED: + resume = suspendToken; + suspendToken = null; + state = State.RESUMED; + break; + + case RESUMED: + throw new IllegalStateException(); + } + } + + // Get more content to read. + if (resume != null) + resume.resume(); + } return result; } @@ -207,21 +248,19 @@ public class MessageInputStream extends InputStream implements MessageAppender } } - private void resume() - { - SuspendToken resume; - synchronized (this) - { - resume = suspendToken; - suspendToken = null; - } - if (resume != null) - resume.resume(); - } - @Override public void reset() throws IOException { throw new IOException("reset() not supported"); } + + private ByteBuffer acquire(int capacity, boolean direct) + { + ByteBuffer buffer; + if (bufferPool != null) + buffer = bufferPool.acquire(capacity, direct); + else + buffer = direct ? BufferUtil.allocateDirect(capacity) : BufferUtil.allocate(capacity); + return buffer; + } } From 08b1be6ea891aa85fa5b1f5a629698a0daa2b37e Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 17 Jan 2020 18:37:47 +1100 Subject: [PATCH 06/11] Issue #4475 - improve testing for MessageInputStream Signed-off-by: Lachlan Roberts --- .../message/MessageInputStreamTest.java | 357 +++++++++++------- 1 file changed, 212 insertions(+), 145 deletions(-) diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageInputStreamTest.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageInputStreamTest.java index 70c2a7527b6..4266ed51542 100644 --- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageInputStreamTest.java +++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageInputStreamTest.java @@ -24,12 +24,15 @@ import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; +import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.BufferUtil; +import org.eclipse.jetty.websocket.api.SuspendToken; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -37,6 +40,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import static java.time.Duration.ofSeconds; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; @ExtendWith(WorkDirExtension.class) public class MessageInputStreamTest @@ -48,116 +53,107 @@ public class MessageInputStreamTest @Test public void testBasicAppendRead() throws IOException { - try (MessageInputStream stream = new MessageInputStream(new EmptySession())) - { - Assertions.assertTimeoutPreemptively(ofSeconds(5), () -> - { - // Append a single message (simple, short) - ByteBuffer payload = BufferUtil.toBuffer("Hello World", StandardCharsets.UTF_8); - boolean fin = true; - stream.appendFrame(payload, fin); + StreamTestSession session = new StreamTestSession(); + MessageInputStream stream = new MessageInputStream(session); + session.setMessageInputStream(stream); - // Read entire message it from the stream. - byte[] buf = new byte[32]; - int len = stream.read(buf); - String message = new String(buf, 0, len, StandardCharsets.UTF_8); + // Append a single message (simple, short) + ByteBuffer payload = BufferUtil.toBuffer("Hello World!", StandardCharsets.UTF_8); + session.addContent(payload, true); + session.provideContent(); - // Test it - assertThat("Message", message, is("Hello World")); - }); - } + // Read entire message it from the stream. + byte[] buf = new byte[32]; + int len = stream.read(buf); + String message = new String(buf, 0, len, StandardCharsets.UTF_8); + + // Test it + assertThat("Message", message, is("Hello World!")); } @Test public void testBlockOnRead() throws Exception { - try (MessageInputStream stream = new MessageInputStream(new EmptySession())) + StreamTestSession session = new StreamTestSession(); + MessageInputStream stream = new MessageInputStream(session); + session.setMessageInputStream(stream); + new Thread(session::provideContent).start(); + + final AtomicBoolean hadError = new AtomicBoolean(false); + final CountDownLatch startLatch = new CountDownLatch(1); + + // This thread fills the stream (from the "worker" thread) + // But slowly (intentionally). + new Thread(() -> { - final AtomicBoolean hadError = new AtomicBoolean(false); - final CountDownLatch startLatch = new CountDownLatch(1); - - // This thread fills the stream (from the "worker" thread) - // But slowly (intentionally). - new Thread(new Runnable() + try { - @Override - public void run() - { - try - { - startLatch.countDown(); - boolean fin = false; - TimeUnit.MILLISECONDS.sleep(200); - stream.appendFrame(BufferUtil.toBuffer("Saved", StandardCharsets.UTF_8), fin); - TimeUnit.MILLISECONDS.sleep(200); - stream.appendFrame(BufferUtil.toBuffer(" by ", StandardCharsets.UTF_8), fin); - fin = true; - TimeUnit.MILLISECONDS.sleep(200); - stream.appendFrame(BufferUtil.toBuffer("Zero", StandardCharsets.UTF_8), fin); - } - catch (IOException | InterruptedException e) - { - hadError.set(true); - e.printStackTrace(System.err); - } - } - }).start(); - - Assertions.assertTimeoutPreemptively(ofSeconds(5), () -> + startLatch.countDown(); + TimeUnit.MILLISECONDS.sleep(200); + session.addContent("Saved", false); + TimeUnit.MILLISECONDS.sleep(200); + session.addContent(" by ", false); + TimeUnit.MILLISECONDS.sleep(200); + session.addContent("Zero", false); + TimeUnit.MILLISECONDS.sleep(200); + session.addContent("", true); + } + catch (Throwable t) { - // wait for thread to start - startLatch.await(); + hadError.set(true); + t.printStackTrace(System.err); + } + }).start(); - // Read it from the stream. - byte[] buf = new byte[32]; - int len = stream.read(buf); - String message = new String(buf, 0, len, StandardCharsets.UTF_8); + Assertions.assertTimeoutPreemptively(ofSeconds(5), () -> + { + // wait for thread to start + startLatch.await(); - // Test it - assertThat("Error when appending", hadError.get(), is(false)); - assertThat("Message", message, is("Saved by Zero")); - }); - } + // Read it from the stream. + byte[] buf = new byte[32]; + int len = stream.read(buf); + String message = new String(buf, 0, len, StandardCharsets.UTF_8); + + // Test it + assertThat("Error when appending", hadError.get(), is(false)); + assertThat("Message", message, is("Saved by Zero")); + }); } @Test public void testBlockOnReadInitial() throws IOException { - try (MessageInputStream stream = new MessageInputStream(new EmptySession())) + StreamTestSession session = new StreamTestSession(); + MessageInputStream stream = new MessageInputStream(session); + session.setMessageInputStream(stream); + session.addContent("I will conquer", true); + + AtomicReference error = new AtomicReference<>(); + new Thread(() -> { - final AtomicBoolean hadError = new AtomicBoolean(false); - - new Thread(new Runnable() + try { - @Override - public void run() - { - try - { - boolean fin = true; - // wait for a little bit before populating buffers - TimeUnit.MILLISECONDS.sleep(400); - stream.appendFrame(BufferUtil.toBuffer("I will conquer", StandardCharsets.UTF_8), fin); - } - catch (IOException | InterruptedException e) - { - hadError.set(true); - e.printStackTrace(System.err); - } - } - }).start(); - - Assertions.assertTimeoutPreemptively(ofSeconds(10), () -> + // wait for a little bit before initiating write to stream + TimeUnit.MILLISECONDS.sleep(1000); + session.provideContent(); + } + catch (Throwable t) { - // Read byte from stream. - int b = stream.read(); - // Should be a byte, blocking till byte received. + error.set(t); + t.printStackTrace(System.err); + } + }).start(); - // Test it - assertThat("Error when appending", hadError.get(), is(false)); - assertThat("Initial byte", b, is((int)'I')); - }); - } + Assertions.assertTimeoutPreemptively(ofSeconds(10), () -> + { + // Read byte from stream, block until byte received. + int b = stream.read(); + assertThat("Initial byte", b, is((int)'I')); + + // No error occurred. + assertNull(error.get()); + }); } @Test @@ -167,89 +163,160 @@ public class MessageInputStreamTest { final AtomicBoolean hadError = new AtomicBoolean(false); - new Thread(new Runnable() + new Thread(() -> { - @Override - public void run() + try { - try - { - // wait for a little bit before sending input closed - TimeUnit.MILLISECONDS.sleep(400); - stream.messageComplete(); - } - catch (InterruptedException e) - { - hadError.set(true); - e.printStackTrace(System.err); - } + // wait for a little bit before sending input closed + TimeUnit.MILLISECONDS.sleep(1000); + stream.messageComplete(); + } + catch (InterruptedException e) + { + hadError.set(true); + e.printStackTrace(System.err); } }).start(); Assertions.assertTimeoutPreemptively(ofSeconds(10), () -> { - // Read byte from stream. + // Read byte from stream. Should be a -1, indicating the end of the stream. int b = stream.read(); - // Should be a -1, indicating the end of the stream. - - // Test it - assertThat("Error when appending", hadError.get(), is(false)); assertThat("Initial byte", b, is(-1)); + + // No error occurred. + assertThat("Error when appending", hadError.get(), is(false)); }); } } @Test - public void testAppendEmptyPayloadRead() throws IOException + public void testSplitMessageWithEmptyPayloads() throws IOException { - try (MessageInputStream stream = new MessageInputStream(new EmptySession())) - { - Assertions.assertTimeoutPreemptively(ofSeconds(10), () -> - { - // Append parts of message - ByteBuffer msg1 = BufferUtil.toBuffer("Hello ", StandardCharsets.UTF_8); - ByteBuffer msg2 = ByteBuffer.allocate(0); // what is being tested - ByteBuffer msg3 = BufferUtil.toBuffer("World", StandardCharsets.UTF_8); + StreamTestSession session = new StreamTestSession(); + MessageInputStream stream = new MessageInputStream(session); + session.setMessageInputStream(stream); - stream.appendFrame(msg1, false); - stream.appendFrame(msg2, false); - stream.appendFrame(msg3, true); + session.addContent("", false); + session.addContent("Hello", false); + session.addContent("", false); + session.addContent(" World", false); + session.addContent("!", false); + session.addContent("", true); + session.provideContent(); - // Read entire message it from the stream. - byte[] buf = new byte[32]; - int len = stream.read(buf); - String message = new String(buf, 0, len, StandardCharsets.UTF_8); + // Read entire message it from the stream. + byte[] buf = new byte[32]; + int len = stream.read(buf); + String message = new String(buf, 0, len, StandardCharsets.UTF_8); - // Test it - assertThat("Message", message, is("Hello World")); - }); - } + // Test it + assertThat("Message", message, is("Hello World!")); } @Test - public void testAppendNullPayloadRead() throws IOException + public void testReadBeforeFirstAppend() throws IOException { - try (MessageInputStream stream = new MessageInputStream(new EmptySession())) + StreamTestSession session = new StreamTestSession(); + MessageInputStream stream = new MessageInputStream(session); + session.setMessageInputStream(stream); + + // Append a single message (simple, short) + session.addContent(BufferUtil.EMPTY_BUFFER, false); + session.addContent("Hello World", true); + + new Thread(() -> { - Assertions.assertTimeoutPreemptively(ofSeconds(10), () -> + try { - // Append parts of message - ByteBuffer msg1 = BufferUtil.toBuffer("Hello ", StandardCharsets.UTF_8); - ByteBuffer msg2 = null; // what is being tested - ByteBuffer msg3 = BufferUtil.toBuffer("World", StandardCharsets.UTF_8); + Thread.sleep(2000); + session.provideContent(); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + }).start(); - stream.appendFrame(msg1, false); - stream.appendFrame(msg2, false); - stream.appendFrame(msg3, true); + // Read entire message it from the stream. + byte[] buf = new byte[32]; + int len = stream.read(buf); + String message = new String(buf, 0, len, StandardCharsets.UTF_8); - // Read entire message it from the stream. - byte[] buf = new byte[32]; - int len = stream.read(buf); - String message = new String(buf, 0, len, StandardCharsets.UTF_8); + // Test it + assertThat("Message", message, is("Hello World")); + } - // Test it - assertThat("Message", message, is("Hello World")); - }); + public static class StreamTestSession extends EmptySession + { + private static final ByteBuffer EOF = BufferUtil.allocate(0); + private final AtomicBoolean suspended = new AtomicBoolean(false); + private BlockingArrayQueue contentQueue = new BlockingArrayQueue<>(); + private MessageInputStream stream; + + public void setMessageInputStream(MessageInputStream stream) + { + this.stream = stream; + } + + public void addContent(String content, boolean last) + { + addContent(BufferUtil.toBuffer(content, StandardCharsets.UTF_8), last); + } + + public void addContent(ByteBuffer content, boolean last) + { + contentQueue.add(content); + if (last) + contentQueue.add(EOF); + } + + public void provideContent() + { + pollAndAppendFrame(); + } + + @Override + public void resume() + { + if (!suspended.compareAndSet(true, false)) + throw new IllegalStateException(); + pollAndAppendFrame(); + } + + @Override + public SuspendToken suspend() + { + if (!suspended.compareAndSet(false, true)) + throw new IllegalStateException(); + return super.suspend(); + } + + private void pollAndAppendFrame() + { + try + { + while (true) + { + ByteBuffer content = contentQueue.poll(10, TimeUnit.SECONDS); + assertNotNull(content); + + boolean eof = (content == EOF); + stream.appendFrame(content, eof); + if (eof) + { + stream.messageComplete(); + break; + } + + if (suspended.get()) + break; + } + } + catch (Exception e) + { + throw new RuntimeException(e); + } } } } From 7b38981d25d14afb4a12ff1f2596756144edf695 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 17 Jan 2020 06:21:47 -0600 Subject: [PATCH 07/11] Updating to version 9.4.26.v20200117 --- VERSION.txt | 20 ++- aggregates/jetty-all-compact3/pom.xml | 2 +- aggregates/jetty-all/pom.xml | 2 +- apache-jsp/pom.xml | 2 +- apache-jstl/pom.xml | 2 +- build-resources/pom.xml | 2 +- examples/async-rest/async-rest-jar/pom.xml | 2 +- examples/async-rest/async-rest-webapp/pom.xml | 2 +- examples/async-rest/pom.xml | 2 +- examples/embedded/pom.xml | 2 +- examples/pom.xml | 2 +- jetty-alpn/jetty-alpn-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-openjdk8-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-openjdk8-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 134 +++++++++--------- jetty-cdi/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 2 +- jetty-documentation/pom.xml | 2 +- jetty-fcgi/fcgi-client/pom.xml | 2 +- jetty-fcgi/fcgi-server/pom.xml | 2 +- jetty-fcgi/pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-gcloud/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 +- jetty-home/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-http2/http2-alpn-tests/pom.xml | 2 +- jetty-http2/http2-client/pom.xml | 2 +- jetty-http2/http2-common/pom.xml | 2 +- jetty-http2/http2-hpack/pom.xml | 2 +- .../http2-http-client-transport/pom.xml | 2 +- jetty-http2/http2-server/pom.xml | 2 +- jetty-http2/pom.xml | 2 +- jetty-infinispan/infinispan-common/pom.xml | 2 +- .../infinispan-embedded-query/pom.xml | 2 +- jetty-infinispan/infinispan-embedded/pom.xml | 2 +- .../infinispan-remote-query/pom.xml | 2 +- jetty-infinispan/infinispan-remote/pom.xml | 2 +- jetty-infinispan/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaas/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmh/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 2 +- .../jetty-memcached-sessions/pom.xml | 2 +- jetty-memcached/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-openid/pom.xml | 2 +- jetty-osgi/jetty-osgi-alpn/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-fragment/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-server/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quickstart/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-runner/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-spring/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-unixsocket/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- .../javax-websocket-client-impl/pom.xml | 2 +- .../javax-websocket-server-impl/pom.xml | 2 +- jetty-websocket/jetty-websocket-tests/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-distribution/pom.xml | 2 +- tests/test-http-client-transport/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-jmx/jmx-webapp-it/pom.xml | 2 +- tests/test-jmx/jmx-webapp/pom.xml | 2 +- tests/test-jmx/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-quickstart/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- .../test-sessions/test-file-sessions/pom.xml | 2 +- .../test-gcloud-sessions/pom.xml | 2 +- .../test-hazelcast-sessions/pom.xml | 2 +- .../test-infinispan-sessions/pom.xml | 2 +- .../test-sessions/test-jdbc-sessions/pom.xml | 2 +- .../test-memcached-sessions/pom.xml | 2 +- .../test-mongodb-sessions/pom.xml | 2 +- .../test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- .../test-cdi-common-webapp/pom.xml | 2 +- tests/test-webapps/test-felix-webapp/pom.xml | 2 +- tests/test-webapps/test-http2-webapp/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 +- .../test-webapps/test-mock-resources/pom.xml | 2 +- .../test-webapps/test-owb-cdi-webapp/pom.xml | 2 +- tests/test-webapps/test-proxy-webapp/pom.xml | 2 +- tests/test-webapps/test-servlet-spec/pom.xml | 2 +- .../test-container-initializer/pom.xml | 2 +- .../test-spec-webapp/pom.xml | 2 +- .../test-web-fragment/pom.xml | 2 +- tests/test-webapps/test-simple-webapp/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- .../test-webapps/test-weld-cdi-webapp/pom.xml | 2 +- 136 files changed, 214 insertions(+), 208 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 2e2f1ea2d98..5abcc8fdb30 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,10 @@ -jetty-9.4.26-SNAPSHOT +jetty-9.4.26.v20200117 - 17 January 2020 + + 2620 Exception from user endpoint onClose results in unclosed + WebSocketSession + + 4383 Errors deleting multipart tmp files java.lang.NullPointerException + under heavy load + + 4444 TLS Connection Timeout Intermittently + + 4461 IllegalStateException in HttpOutput with Jersey jetty-9.4.25.v20191220 - 20 December 2019 + 995 UrlEncoded.encodeString should skip more characters @@ -9,13 +15,13 @@ jetty-9.4.25.v20191220 - 20 December 2019 + 4269 ResponseWriter should not throw RuntimeIOExceptions + 4323 QOS Filter does not handle IllegalStateException and never releases passes - + 4329 rewrite prevents URL session tracking. + + 4329 rewrite prevents URL session tracking + 4331 Improve handling of HttpOutput.close() for pending writes + 4350 Deprecated MultiPartInputStreamParser still used in jetty-server (MultiPartsUtilParser) but OSGi ExportPackage suppressed + 4351 Servlet.service called before Servlet.init is finished when servlet is lazily initialized - + 4363 jetty-maven-plugin no longer processes supplied context.xml-file. + + 4363 jetty-maven-plugin no longer processes supplied context.xml-file + 4366 HTTP client uses SOCKS4 proxy hostname for SSL hostname verification + 4374 Jetty client: Response.AsyncContentListener.onContent is not called + 4376 Async Content Complete bug results in @@ -24,10 +30,10 @@ jetty-9.4.25.v20191220 - 20 December 2019 SslContextFactory usage + 4392 Suppress logging of QuietException in HttpChannelState.asyncError() + 4402 NPE in JettyRunWarExplodedMojo - + 4411 Jetty server spins on incomplete request due to delayed dispatch - until content - + 4415 GzipHandler invalid input zip size on large - (over 2,147,483,647 bytes) request body content + + 4411 Jetty server spins on incomplete request due to delayed dispatch until + content + + 4415 GzipHandler invalid input zip size on large (over 2,147,483,647 bytes) + request body content + 4421 HttpClient support for PROXY protocol + 4427 Retried HttpClient Requests can result in duplicates cookies diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index 507d86d6c20..ef3330dd0a4 100644 --- a/aggregates/jetty-all-compact3/pom.xml +++ b/aggregates/jetty-all-compact3/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../../pom.xml 4.0.0 diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 2a955191960..4db37ab9a24 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../../pom.xml 4.0.0 diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 4ba8bef6cbf..962f96f18f3 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 apache-jsp diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index d468058bfe0..28414b6417e 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 apache-jstl diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 5516b0a14cb..46348f8a2a8 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.eclipse.jetty build-resources - 9.4.26-SNAPSHOT + 9.4.26.v20200117 jar Jetty :: Build Resources diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index 1188ad333e5..583689502ff 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.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index fe9455d262f..d8ea936b831 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.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index 013d4442377..499c0709b0a 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 19cc3c1f6a3..263310a7381 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 8820187a12e..08d25f87c94 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index 165512de1b9..d43042f7b64 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-alpn-client diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index ed1204db6ff..0f40c504713 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index 880d2ace2fe..674ec9f9361 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index c2413433a5c..2a77b1700cb 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 95ac87c61cb..9f37fe60b80 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml b/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml index f4a6d455868..ffb02f9be12 100644 --- a/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml +++ b/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml b/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml index 1b97fdc8a59..2185105af4f 100644 --- a/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml +++ b/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 53c1c9ecd62..fc5d4aae8fb 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 3692fe1473b..ca18d0b1ebf 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 8bbfa625e4a..1d631930977 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index b5d1cbb85a2..6697f405a6a 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index b630e093042..287732c3512 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -9,7 +9,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 @@ -53,336 +53,336 @@ org.eclipse.jetty apache-jsp - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty apache-jstl - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-alpn-client - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-alpn-java-client - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-alpn-java-server - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-alpn-openjdk8-client - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-alpn-openjdk8-server - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-alpn-conscrypt-client - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-alpn-conscrypt-server - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-alpn-server - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-annotations - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-ant - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-client - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-continuation - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-deploy - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-distribution - 9.4.26-SNAPSHOT + 9.4.26.v20200117 zip org.eclipse.jetty jetty-distribution - 9.4.26-SNAPSHOT + 9.4.26.v20200117 tar.gz org.eclipse.jetty.fcgi fcgi-client - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.fcgi fcgi-server - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-home - 9.4.26-SNAPSHOT + 9.4.26.v20200117 zip org.eclipse.jetty jetty-home - 9.4.26-SNAPSHOT + 9.4.26.v20200117 tar.gz org.eclipse.jetty jetty-http - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.http2 http2-client - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.http2 http2-common - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.http2 http2-hpack - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.http2 http2-http-client-transport - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.http2 http2-server - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-http-spi - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty infinispan-common - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty infinispan-remote-query - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty infinispan-embedded-query - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-hazelcast - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-io - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-jaas - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-jaspi - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-jmx - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-jndi - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.memcached jetty-memcached-sessions - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-nosql - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.osgi jetty-osgi-boot - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.osgi jetty-httpservice - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-plus - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-proxy - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-quickstart - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-rewrite - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-security - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-openid - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-server - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-servlet - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-servlets - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-spring - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-unixsocket - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-util - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-util-ajax - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-webapp - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.websocket javax-websocket-client-impl - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.websocket javax-websocket-server-impl - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.websocket websocket-api - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.websocket websocket-client - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.websocket websocket-common - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.websocket websocket-server - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty.websocket websocket-servlet - 9.4.26-SNAPSHOT + 9.4.26.v20200117 org.eclipse.jetty jetty-xml - 9.4.26-SNAPSHOT + 9.4.26.v20200117 diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 9aabdc0fd8a..2c09e251631 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index af5d1a3f5ec..ad15e0c73a4 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index c2d8a372315..04ca0dc9b81 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 5868973c1c2..31ccae65c0f 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 240a90d91af..ec4c2d46363 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-distribution diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml index 4688c849562..6c387d3908d 100644 --- a/jetty-documentation/pom.xml +++ b/jetty-documentation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 jetty-documentation Jetty :: Documentation diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index 0f3d34abf65..1be9336a5b3 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 368a1a293a6..e4c22488c82 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index edb4706da08..61f21f999da 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index bc5b7f3e72b..9612d14d2b7 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index daa88a0768c..23c93ce80cc 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index cdd6ef63438..bb02cb07a58 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 0e43f2d9859..d3480167664 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 5bb902c1579..2896d27ff89 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index bbab2104012..9ca3b03ad43 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-http diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index 10d75ba523d..02a0b50c4e7 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 6fdc3ae48c4..d892d262307 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 31df73baf0b..698fc2f8db5 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index df334b22ba3..7a1ab67840d 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index 15081ff6b51..cf9cd3916ce 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 21c482118ca..93127fae0dd 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index e6ed21f5416..ffc555e9c7a 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index 59e12ea04b8..ee3daaa9df6 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 infinispan-common diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index 49c2e24cc38..1913d1bbba7 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index fa22be92bbb..7cb81a10f5d 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 infinispan-embedded diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index 740b1da50d0..908e7cd079d 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index f2941fa537c..897a9d9c475 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 3f20258ef56..07c27936e5c 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 590d0cff2e0..8badb0cc3eb 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 282b7cb32eb..74ac560711d 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index fc8a2bf527a..4b286f1fd6a 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-jmh/pom.xml b/jetty-jmh/pom.xml index fed9845d558..fe9791e73cf 100644 --- a/jetty-jmh/pom.xml +++ b/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 5de7e47d445..1dfa03e48d5 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 3194e8db487..307d4db24f6 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-jndi diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 5d5a4366e19..6e002968c00 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 853104a353e..3a10400f793 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-maven-plugin diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 821f2828ec8..3e5d20bf7a3 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.memcached memcached-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index 5b7398994b2..795d6022095 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index a91ea85d8b7..bce431b299b 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 472ffc92c14..4e5dd8d998d 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index e36453ca4c2..5f90cfa9cf1 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-osgi-alpn diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index fce7c839166..34acd9aab16 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.4.26-SNAPSHOT + 9.4.26.v20200117 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 7a403738bc6..eccf4873ce5 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.4.26-SNAPSHOT + 9.4.26.v20200117 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index bc6bcab3fff..3cf674c3dfb 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.4.26-SNAPSHOT + 9.4.26.v20200117 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 10721aea523..48a985242c1 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.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 836b0ee5feb..d2818c05353 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 71867fda517..1f1e709f44c 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.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 test-jetty-osgi-context diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index 8bbe1ea86c1..604a47aae8f 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index d94b28d8c38..db7d4d58111 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 test-jetty-osgi-server diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index 365bc825407..e4374f71279 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.4.26-SNAPSHOT + 9.4.26.v20200117 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index b31d0c5a2bb..6c942abd82b 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.4.26-SNAPSHOT + 9.4.26.v20200117 ../pom.xml 4.0.0 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 95c0a9c4555..4dce13cb3b0 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 0b309eaff77..553c94209c3 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-proxy diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index e0264a955dd..7b45e41f7c0 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 org.eclipse.jetty diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 7fb778e8a6e..b6479007a9f 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 9cdb117ac15..01edbe92df2 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 7932761060f..4ef46a39ccd 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index b3aca6e4eed..c86783f8657 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index f2fbbd75185..44613a0be06 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 17a0e044647..3f445dcd662 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-servlets diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 10dd352a873..f26d25354dc 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 436a075483c..9b398a0e949 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-start diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 02b6bbbbda7..876f59ffb0e 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-unixsocket diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index b3836020633..2d9e91c3f17 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 52dab6cc745..b11c41ef17a 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 584ec4249f7..52e1400f2ad 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-webapp diff --git a/jetty-websocket/javax-websocket-client-impl/pom.xml b/jetty-websocket/javax-websocket-client-impl/pom.xml index e2decdfc95b..50a1d3d7666 100644 --- a/jetty-websocket/javax-websocket-client-impl/pom.xml +++ b/jetty-websocket/javax-websocket-client-impl/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml index 16111dd6eb2..647bcb9b947 100644 --- a/jetty-websocket/javax-websocket-server-impl/pom.xml +++ b/jetty-websocket/javax-websocket-server-impl/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-websocket/jetty-websocket-tests/pom.xml b/jetty-websocket/jetty-websocket-tests/pom.xml index 4cc6c089705..3db6e3fd150 100644 --- a/jetty-websocket/jetty-websocket-tests/pom.xml +++ b/jetty-websocket/jetty-websocket-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index dafbb8ecb8d..84bf7c2e81b 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index aa37235d6b1..45c3bda6d60 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.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index be63fc3c755..9dbf39cded7 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.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index 97897104f77..46c0cd7ee86 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.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index 33a60d2a3b2..f094f41f935 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.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 9590935e48f..5265e927aff 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.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index f5f87cf796d..c7414ca8c6e 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 03c0471e296..c8e115ddc7f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/pom.xml b/tests/pom.xml index ac47490c020..ac5beee16a0 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index cc8a6a89456..9b137fb5920 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../pom.xml 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 84da4d6e6a0..66e34c12719 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ tests-parent org.eclipse.jetty.tests - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index cdd8d34f530..6c5fa7dadcb 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index a0325f664e7..9c35c5b5c0a 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 test-integration diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index 4be61c0321f..598582b6934 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-jmx-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 jmx-webapp-it diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index 27d1cbb9ac4..a5a612a2b22 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-jmx-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index f9beaf752d4..a793f109590 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 test-jmx-parent diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 6463720a42c..43b65102584 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 05502698a7f..624093168f3 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index f9b778761cb..ef5aeddacbc 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index 5f5dd6c64f0..045aa998c4f 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-file-sessions Jetty Tests :: Sessions :: File diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index 29c11e88249..eb50e67b86f 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-gcloud-sessions Jetty Tests :: Sessions :: GCloud diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index ff6fd0663a3..46c1975a0ab 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-hazelcast-sessions Jetty Tests :: Sessions :: Hazelcast diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index ef7fe7ed58d..ef44325a126 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-infinispan-sessions Jetty Tests :: Sessions :: Infinispan diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 990c8ca47b3..507d2dd06ad 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index dd274b05ac5..a9dc02be959 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-memcached-sessions Jetty Tests :: Sessions :: Memcached diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 9a70798dd4d..eac3a2c95fd 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 82e2bdd29f0..ebe20cad780 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 967995de1ef..9cad357bfc5 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index 17ef858bfe2..5eff0d3a107 100644 --- a/tests/test-webapps/test-cdi-common-webapp/pom.xml +++ b/tests/test-webapps/test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index 99cde4bf02c..b1ccd8c9ea1 100644 --- a/tests/test-webapps/test-felix-webapp/pom.xml +++ b/tests/test-webapps/test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 942cf24e241..1646444007c 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml index 0e8e8a330a9..4ec5d0aab7c 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.4.26-SNAPSHOT + 9.4.26.v20200117 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 8d4c39f53a9..c0aa9231250 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../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 7fd27576560..d5c3a95be47 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.4.26-SNAPSHOT + 9.4.26.v20200117 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 66751ef975c..50f0aeb009f 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.4.26-SNAPSHOT + 9.4.26.v20200117 Jetty Tests :: WebApp :: Mock Resources test-mock-resources diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 21811305f87..0ec1c864cdf 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml index e07b5a2bb1f..682283aa7dc 100644 --- a/tests/test-webapps/test-proxy-webapp/pom.xml +++ b/tests/test-webapps/test-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 ../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 c81ccee28b5..2c599c2b6ad 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.4.26-SNAPSHOT + 9.4.26.v20200117 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 dfd76d864a1..bee7b962a34 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.4.26-SNAPSHOT + 9.4.26.v20200117 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 859ae347b23..fa1af60aa04 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.4.26-SNAPSHOT + 9.4.26.v20200117 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 2dc3cf84169..40830c57f05 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.4.26-SNAPSHOT + 9.4.26.v20200117 Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar diff --git a/tests/test-webapps/test-simple-webapp/pom.xml b/tests/test-webapps/test-simple-webapp/pom.xml index 906093721c6..85a15938d0f 100644 --- a/tests/test-webapps/test-simple-webapp/pom.xml +++ b/tests/test-webapps/test-simple-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-simple-webapp diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 1fc6b40f9cd..ab5ed7a7040 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index b5ff2eede7c..8426c2c144a 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26-SNAPSHOT + 9.4.26.v20200117 4.0.0 From 56fc476d5517b98c771ccea021501db70501aa03 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 17 Jan 2020 07:00:10 -0600 Subject: [PATCH 08/11] Updating to version 9.4.27-SNAPSHOT --- VERSION.txt | 2 + aggregates/jetty-all-compact3/pom.xml | 2 +- aggregates/jetty-all/pom.xml | 2 +- apache-jsp/pom.xml | 2 +- apache-jstl/pom.xml | 2 +- build-resources/pom.xml | 2 +- examples/async-rest/async-rest-jar/pom.xml | 2 +- examples/async-rest/async-rest-webapp/pom.xml | 2 +- examples/async-rest/pom.xml | 2 +- examples/embedded/pom.xml | 2 +- examples/pom.xml | 2 +- jetty-alpn/jetty-alpn-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-client/pom.xml | 2 +- .../jetty-alpn-conscrypt-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-openjdk8-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-openjdk8-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 134 +++++++++--------- jetty-cdi/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 2 +- jetty-documentation/pom.xml | 2 +- jetty-fcgi/fcgi-client/pom.xml | 2 +- jetty-fcgi/fcgi-server/pom.xml | 2 +- jetty-fcgi/pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-gcloud/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 +- jetty-home/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-http2/http2-alpn-tests/pom.xml | 2 +- jetty-http2/http2-client/pom.xml | 2 +- jetty-http2/http2-common/pom.xml | 2 +- jetty-http2/http2-hpack/pom.xml | 2 +- .../http2-http-client-transport/pom.xml | 2 +- jetty-http2/http2-server/pom.xml | 2 +- jetty-http2/pom.xml | 2 +- jetty-infinispan/infinispan-common/pom.xml | 2 +- .../infinispan-embedded-query/pom.xml | 2 +- jetty-infinispan/infinispan-embedded/pom.xml | 2 +- .../infinispan-remote-query/pom.xml | 2 +- jetty-infinispan/infinispan-remote/pom.xml | 2 +- jetty-infinispan/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaas/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmh/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 2 +- .../jetty-memcached-sessions/pom.xml | 2 +- jetty-memcached/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-openid/pom.xml | 2 +- jetty-osgi/jetty-osgi-alpn/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-fragment/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-server/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quickstart/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-runner/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-spring/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-unixsocket/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- .../javax-websocket-client-impl/pom.xml | 2 +- .../javax-websocket-server-impl/pom.xml | 2 +- jetty-websocket/jetty-websocket-tests/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-distribution/pom.xml | 2 +- tests/test-http-client-transport/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-jmx/jmx-webapp-it/pom.xml | 2 +- tests/test-jmx/jmx-webapp/pom.xml | 2 +- tests/test-jmx/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-quickstart/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- .../test-sessions/test-file-sessions/pom.xml | 2 +- .../test-gcloud-sessions/pom.xml | 2 +- .../test-hazelcast-sessions/pom.xml | 2 +- .../test-infinispan-sessions/pom.xml | 2 +- .../test-sessions/test-jdbc-sessions/pom.xml | 2 +- .../test-memcached-sessions/pom.xml | 2 +- .../test-mongodb-sessions/pom.xml | 2 +- .../test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- .../test-cdi-common-webapp/pom.xml | 2 +- tests/test-webapps/test-felix-webapp/pom.xml | 2 +- tests/test-webapps/test-http2-webapp/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 +- .../test-webapps/test-mock-resources/pom.xml | 2 +- .../test-webapps/test-owb-cdi-webapp/pom.xml | 2 +- tests/test-webapps/test-proxy-webapp/pom.xml | 2 +- tests/test-webapps/test-servlet-spec/pom.xml | 2 +- .../test-container-initializer/pom.xml | 2 +- .../test-spec-webapp/pom.xml | 2 +- .../test-web-fragment/pom.xml | 2 +- tests/test-webapps/test-simple-webapp/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- .../test-webapps/test-weld-cdi-webapp/pom.xml | 2 +- 136 files changed, 203 insertions(+), 201 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 5abcc8fdb30..fbe0ca9080e 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-9.4.27-SNAPSHOT + jetty-9.4.26.v20200117 - 17 January 2020 + 2620 Exception from user endpoint onClose results in unclosed WebSocketSession diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index ef3330dd0a4..59f3e1cfce3 100644 --- a/aggregates/jetty-all-compact3/pom.xml +++ b/aggregates/jetty-all-compact3/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 4db37ab9a24..3b434c911b5 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 962f96f18f3..4529f62b3f2 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 apache-jsp diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index 28414b6417e..07badb23754 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 apache-jstl diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 46348f8a2a8..a498c3681cd 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.eclipse.jetty build-resources - 9.4.26.v20200117 + 9.4.27-SNAPSHOT jar Jetty :: Build Resources diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index 583689502ff..dcf38865f98 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.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index d8ea936b831..5def44baa1d 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.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index 499c0709b0a..a59fda815c9 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 263310a7381..715d77f9766 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 08d25f87c94..e4a37133daf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index d43042f7b64..b38d34c5e90 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-alpn-client diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 0f40c504713..c4c818f879a 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index 674ec9f9361..27cb90db874 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 2a77b1700cb..1d33222d221 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 9f37fe60b80..fdb219e1e9d 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml b/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml index ffb02f9be12..eb990a4e48d 100644 --- a/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml +++ b/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml b/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml index 2185105af4f..02fa9f32c6b 100644 --- a/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml +++ b/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index fc5d4aae8fb..4dd0e378a05 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index ca18d0b1ebf..eaef6eac046 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 1d631930977..e571060647d 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 6697f405a6a..d7ac6cd4313 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 287732c3512..4f102330ad3 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -9,7 +9,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT @@ -53,336 +53,336 @@ org.eclipse.jetty apache-jsp - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty apache-jstl - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-alpn-client - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-alpn-java-client - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-alpn-java-server - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-alpn-openjdk8-client - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-alpn-openjdk8-server - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-client - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-server - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-alpn-server - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-annotations - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-ant - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-client - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-continuation - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-deploy - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-distribution - 9.4.26.v20200117 + 9.4.27-SNAPSHOT zip org.eclipse.jetty jetty-distribution - 9.4.26.v20200117 + 9.4.27-SNAPSHOT tar.gz org.eclipse.jetty.fcgi fcgi-client - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.fcgi fcgi-server - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-home - 9.4.26.v20200117 + 9.4.27-SNAPSHOT zip org.eclipse.jetty jetty-home - 9.4.26.v20200117 + 9.4.27-SNAPSHOT tar.gz org.eclipse.jetty jetty-http - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.http2 http2-client - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.http2 http2-common - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.http2 http2-hpack - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.http2 http2-http-client-transport - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.http2 http2-server - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-http-spi - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty infinispan-common - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty infinispan-remote-query - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty infinispan-embedded-query - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-hazelcast - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-io - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-jaas - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-jaspi - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-jmx - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-jndi - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.memcached jetty-memcached-sessions - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-nosql - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.osgi jetty-httpservice - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-plus - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-proxy - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-quickstart - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-rewrite - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-security - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-openid - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-server - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-servlet - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-servlets - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-spring - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-unixsocket - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-util - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-util-ajax - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-webapp - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.websocket javax-websocket-client-impl - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.websocket javax-websocket-server-impl - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.websocket websocket-api - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.websocket websocket-client - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.websocket websocket-common - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.websocket websocket-server - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty.websocket websocket-servlet - 9.4.26.v20200117 + 9.4.27-SNAPSHOT org.eclipse.jetty jetty-xml - 9.4.26.v20200117 + 9.4.27-SNAPSHOT diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 2c09e251631..3e1dccfbc3e 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index ad15e0c73a4..743f2447b64 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 04ca0dc9b81..d841c37d6ad 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 31ccae65c0f..a6672b586de 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index ec4c2d46363..88160c4327f 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-distribution diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml index 6c387d3908d..8a0d63bb72e 100644 --- a/jetty-documentation/pom.xml +++ b/jetty-documentation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT jetty-documentation Jetty :: Documentation diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index 1be9336a5b3..51d2ebd2c0a 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index e4c22488c82..2c0a065e3bb 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index 61f21f999da..28e12122996 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 9612d14d2b7..0b56de85083 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 23c93ce80cc..e05d6f066fc 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index bb02cb07a58..e6b2ba4b00a 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index d3480167664..a44e7adc594 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 2896d27ff89..419ed7a23e8 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 9ca3b03ad43..d49433ab32d 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-http diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index 02a0b50c4e7..3a11f12aa02 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index d892d262307..bcf764464c9 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 698fc2f8db5..6bdd86e2eec 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 7a1ab67840d..6942fd99b1e 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index cf9cd3916ce..26ece10dcba 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 93127fae0dd..fdc17874ffb 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index ffc555e9c7a..bff35af1564 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index ee3daaa9df6..b25013dbecf 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 infinispan-common diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index 1913d1bbba7..999d1f31e9e 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index 7cb81a10f5d..1798081423f 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 infinispan-embedded diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index 908e7cd079d..3c3a9d0620d 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index 897a9d9c475..9e073461df9 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 07c27936e5c..25efb6e464d 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 8badb0cc3eb..348ecb46a63 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 74ac560711d..35f72d4388f 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 4b286f1fd6a..3a6832e0955 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-jmh/pom.xml b/jetty-jmh/pom.xml index fe9791e73cf..78784f73e53 100644 --- a/jetty-jmh/pom.xml +++ b/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 1dfa03e48d5..d2771041277 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 307d4db24f6..3623f63e3ae 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 6e002968c00..54956c443b8 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 3a10400f793..7a57d3265c4 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-maven-plugin diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 3e5d20bf7a3..f5b9048f26b 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.memcached memcached-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index 795d6022095..bbd05c00a6f 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index bce431b299b..9fc89becca7 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 4e5dd8d998d..2df0c70e76e 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 5f90cfa9cf1..34b7677690b 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-osgi-alpn diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 34acd9aab16..5ceb1da1ad5 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.4.26.v20200117 + 9.4.27-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 eccf4873ce5..29ba994c675 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.4.26.v20200117 + 9.4.27-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 3cf674c3dfb..a816b34e8ab 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.4.26.v20200117 + 9.4.27-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 48a985242c1..1e34fa7ac73 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.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index d2818c05353..a273bc5d9aa 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 1f1e709f44c..6b3d96c2553 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.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 test-jetty-osgi-context diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index 604a47aae8f..54b3c43d751 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index db7d4d58111..695fb5b8a7b 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 test-jetty-osgi-server diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index e4374f71279..e2ce3e1f748 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.4.26.v20200117 + 9.4.27-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 6c942abd82b..d88c7f6415b 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.4.26.v20200117 + 9.4.27-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 4dce13cb3b0..cb403a3e873 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 553c94209c3..60a072a6b2a 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-proxy diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 7b45e41f7c0..6870a612a8a 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index b6479007a9f..400f57fe32c 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 01edbe92df2..d23185dcf57 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 4ef46a39ccd..59ed94b3444 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index c86783f8657..5701c9bb104 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 44613a0be06..d26a5ea492a 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 3f445dcd662..39229710aa0 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index f26d25354dc..4d18a3aed01 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 9b398a0e949..e571a1f8f06 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 876f59ffb0e..4be8b55e83c 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-unixsocket diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 2d9e91c3f17..0b3367cd460 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index b11c41ef17a..04506215813 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 52e1400f2ad..79895599b23 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-websocket/javax-websocket-client-impl/pom.xml b/jetty-websocket/javax-websocket-client-impl/pom.xml index 50a1d3d7666..fd85f09b628 100644 --- a/jetty-websocket/javax-websocket-client-impl/pom.xml +++ b/jetty-websocket/javax-websocket-client-impl/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml index 647bcb9b947..ecb4d73edde 100644 --- a/jetty-websocket/javax-websocket-server-impl/pom.xml +++ b/jetty-websocket/javax-websocket-server-impl/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/jetty-websocket-tests/pom.xml b/jetty-websocket/jetty-websocket-tests/pom.xml index 3db6e3fd150..235061f4912 100644 --- a/jetty-websocket/jetty-websocket-tests/pom.xml +++ b/jetty-websocket/jetty-websocket-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 84bf7c2e81b..8f4912b3fb0 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 45c3bda6d60..0c477ac005d 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.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index 9dbf39cded7..b4062e5b27a 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.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index 46c0cd7ee86..a0444792260 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.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index f094f41f935..59288605785 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.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 5265e927aff..1638ce0d02f 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.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index c7414ca8c6e..1afad06fe8d 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index c8e115ddc7f..95572309edc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/pom.xml b/tests/pom.xml index ac5beee16a0..0561472bd46 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.4.26.v20200117 + 9.4.27-SNAPSHOT ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index 9b137fb5920..cc436e82eeb 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 66e34c12719..6d3a987e126 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ tests-parent org.eclipse.jetty.tests - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 6c5fa7dadcb..50f852fe6bb 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 9c35c5b5c0a..d2c60f5dc4d 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 test-integration diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index 598582b6934..c3485056c2e 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-jmx-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 jmx-webapp-it diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index a5a612a2b22..1f50f71cdf5 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-jmx-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index a793f109590..f6f1f3b2914 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 test-jmx-parent diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 43b65102584..7a29572d18a 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 624093168f3..2fea9ee2006 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index ef5aeddacbc..264393aa4b5 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index 045aa998c4f..3dd4452f439 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-file-sessions Jetty Tests :: Sessions :: File diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index eb50e67b86f..9b71169b0a9 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-gcloud-sessions Jetty Tests :: Sessions :: GCloud diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index 46c1975a0ab..ef73bdac9db 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-hazelcast-sessions Jetty Tests :: Sessions :: Hazelcast diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index ef44325a126..ff050718d83 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-infinispan-sessions Jetty Tests :: Sessions :: Infinispan diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 507d2dd06ad..d2fd7a2c1c8 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index a9dc02be959..9730354cd15 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-memcached-sessions Jetty Tests :: Sessions :: Memcached diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index eac3a2c95fd..6e65ad1acc0 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index ebe20cad780..9eab433c284 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 9cad357bfc5..6736d503032 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index 5eff0d3a107..adbd81074e0 100644 --- a/tests/test-webapps/test-cdi-common-webapp/pom.xml +++ b/tests/test-webapps/test-cdi-common-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index b1ccd8c9ea1..5687be4d756 100644 --- a/tests/test-webapps/test-felix-webapp/pom.xml +++ b/tests/test-webapps/test-felix-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 1646444007c..c78eee05af0 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml index 4ec5d0aab7c..9c6194ce088 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.4.26.v20200117 + 9.4.27-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 c0aa9231250..1e494b75af7 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26.v20200117 + 9.4.27-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 d5c3a95be47..c2c2a6e45a1 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.4.26.v20200117 + 9.4.27-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 50f0aeb009f..46c2b287e94 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.4.26.v20200117 + 9.4.27-SNAPSHOT Jetty Tests :: WebApp :: Mock Resources test-mock-resources diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 0ec1c864cdf..b63c1c85916 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml index 682283aa7dc..4fc0b6b0f03 100644 --- a/tests/test-webapps/test-proxy-webapp/pom.xml +++ b/tests/test-webapps/test-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26.v20200117 + 9.4.27-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 2c599c2b6ad..dbecf1b3ca7 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.4.26.v20200117 + 9.4.27-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 bee7b962a34..9ae567d9046 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.4.26.v20200117 + 9.4.27-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 fa1af60aa04..840dc36e6a2 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.4.26.v20200117 + 9.4.27-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 40830c57f05..bad921f3e89 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.4.26.v20200117 + 9.4.27-SNAPSHOT Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar diff --git a/tests/test-webapps/test-simple-webapp/pom.xml b/tests/test-webapps/test-simple-webapp/pom.xml index 85a15938d0f..612fceb3db1 100644 --- a/tests/test-webapps/test-simple-webapp/pom.xml +++ b/tests/test-webapps/test-simple-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-simple-webapp diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index ab5ed7a7040..ab87ad93d69 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index 8426c2c144a..4f149df9814 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.4.26.v20200117 + 9.4.27-SNAPSHOT 4.0.0 From fedc7c65997d433bbdfc26fb3d861f8488f9c804 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 20 Jan 2020 09:21:16 +0100 Subject: [PATCH 09/11] Issue #4360 Update to jasper 8.5.49 (#4487) Signed-off-by: Jan Bartel --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95572309edc..7beff05a0cd 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 1.2.3 1.2 1.1.3.v20160715 - 8.5.40 + 8.5.49 9.4.8.Final undefined From a76fd0e9480f48ced6fa1262b8e205de5fceb94b Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 21 Jan 2020 10:21:52 +0100 Subject: [PATCH 10/11] updated Weld Signed-off-by: Greg Wilkins --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7beff05a0cd..afafc8c29d9 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 3.6.0 1.3.1 3.1.0 - 3.1.2.Final + 3.1.3.Final 1.0.5 From ff19bef4dc394ce5db44f3918c12428c7192d188 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Fri, 24 Jan 2020 19:59:28 +1000 Subject: [PATCH 11/11] alpn for jdk 1.8.0_242 Signed-off-by: olivier lamy --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index afafc8c29d9..93acfea8e95 100644 --- a/pom.xml +++ b/pom.xml @@ -2013,6 +2013,18 @@ 8.1.13.v20181017 + + 8u242 + + + java.version + 1.8.0_242 + + + + 8.1.13.v20181017 + + jdk9