From 590b1a6ab17680b2793e4a1181e6226929cf732a Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 18 May 2020 11:49:12 +1000 Subject: [PATCH 01/17] Issue #4873 - fix timeout on ExecutorThreadPool.join() Signed-off-by: Lachlan Roberts --- .../java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java index db558cb8b89..9d1e2f0ea97 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ExecutorThreadPool.java @@ -302,7 +302,7 @@ public class ExecutorThreadPool extends ContainerLifeCycle implements ThreadPool @Override public void join() throws InterruptedException { - _executor.awaitTermination(getStopTimeout(), TimeUnit.MILLISECONDS); + _executor.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS); } @Override From ae0b70fbfcca858eb554e3660896ed325c5b7b2a Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Wed, 20 May 2020 00:45:05 +1000 Subject: [PATCH 02/17] Issue #4873 - add test to reproduce the ExecutorThreadPool.join() issue Signed-off-by: Lachlan Roberts --- .../util/thread/ExecutorThreadPoolTest.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ExecutorThreadPoolTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ExecutorThreadPoolTest.java index 95ab6a22aab..a495d719bb0 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ExecutorThreadPoolTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ExecutorThreadPoolTest.java @@ -18,7 +18,13 @@ package org.eclipse.jetty.util.thread; +import java.time.Duration; + import org.eclipse.jetty.util.thread.ThreadPool.SizedThreadPool; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; public class ExecutorThreadPoolTest extends AbstractThreadPoolTest { @@ -27,4 +33,22 @@ public class ExecutorThreadPoolTest extends AbstractThreadPoolTest { return new ExecutorThreadPool(max); } + + @Test + public void testJoin() throws Exception + { + final long stopTimeout = 100; + ExecutorThreadPool executorThreadPool = new ExecutorThreadPool(10); + executorThreadPool.setStopTimeout(stopTimeout); + executorThreadPool.start(); + + // Verify that join does not timeout after waiting twice the stopTimeout. + assertThrows(Throwable.class, () -> + assertTimeoutPreemptively(Duration.ofMillis(stopTimeout * 2), executorThreadPool::join) + ); + + // After stopping the ThreadPool join should unblock. + executorThreadPool.stop(); + assertTimeoutPreemptively(Duration.ofMillis(stopTimeout), executorThreadPool::join); + } } From 77c232aed8a45c818fd27232278d9f95a021095e Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 21 May 2020 12:04:14 -0500 Subject: [PATCH 03/17] Updating to version 9.4.29.v20200521 --- VERSION.txt | 28 +++- 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, 227 insertions(+), 203 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index c5f5ce782ea..009f6013f1a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,28 @@ -jetty-9.4.29-SNAPSHOT +jetty-9.4.29.v20200521 - 21 May 2020 + + 2188 Lock contention creating HTTP/2 streams + + 4235 communicate the reason of failure to the OpenID error page + + 4695 HttpChannel recycling in h2 + + 4764 HTTP2 Jetty Server does not send back content-length + + 4778 Enforcing SNI when there are only non-wildcards certificates + + 4787 Make org.eclipse.jetty.client.HttpRequest's host name writable + + 4789 org.eclipse.jetty.util.thread.ShutdownThread should use an appropriate + name to identify itself in Thread dump + + 4798 Better handling of fatal Selector failures + + 4814 Allow a ConnectionFactory (eg SslConnectionFactory) to automatically + add a Customizer + + 4820 Jetty OSGi DefaultJettyAtJettyHomeHelper refers to non-existent + config file + + 4824 WebSocket server outgoing message queue memory growth + + 4828 NIO ByteBuffer corruption in embedded Jetty server + + 4835 GzipHandler and GzipHttpOutputInterceptor do not flush response when + body is empty + + 4860 org.eclipse.jetty.server.HttpChannel busyloop on HttpFields + NullPointerException + + 4861 Combine `AttributesMap` and `Attributes.Wrapper` + + 4868 Update to asm 7.3.1 + + 4892 Non-blocking JSON parser + + 4895 AbstractSessionCache.setFlushOnResponseCommit(true) can write an + invalid session to the backing store jetty-9.4.28.v20200408 - 08 April 2020 + 847 Setting async timeout on WebSocketClient does not seem to timeout writes @@ -8,7 +32,7 @@ jetty-9.4.28.v20200408 - 08 April 2020 + 4529 ErrorHandler showing servlet info, can not be disabled unless overriding most of its functionality + 4542 servlet context root mapping incorrect - + 4619 Inconsistent library versions notice. + + 4619 Inconsistent library versions notice + 4620 Using console-capture with StdErrLog results in empty log file + 4621 jetty-jaspi in jetty-all uber aggregate artifact requires javax.security.auth.message.AuthException which cannot be included diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index 9aa8de61f7d..5a27d149698 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.29-SNAPSHOT + 9.4.29.v20200521 ../../pom.xml 4.0.0 diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index c7ba43155b5..1524b48dfc3 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 ../../pom.xml 4.0.0 diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index d65d9fbcbcc..2d75087709a 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 apache-jsp diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index 7ddb0b852a2..295b9f53d9c 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 apache-jstl diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 2c9845d2625..46b88407b79 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.29-SNAPSHOT + 9.4.29.v20200521 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 85d69939487..288785f42d5 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index 19486ffe653..040aaec8303 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index 799db801363..f40892d591d 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index ef0b4eba461..17734a264f4 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.4.29-SNAPSHOT + 9.4.29.v20200521 ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 284ef573fee..8d3fc417bc6 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index 8886bd3d421..bccf8a700db 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.29-SNAPSHOT + 9.4.29.v20200521 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 a6f273200ae..daef0477762 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index 585cfcec66d..2f395f4d1ed 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 17a626e7e11..c790d1ff1ae 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index af2f2fbe46e..341d8b1a99a 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml b/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml index e7b25f6c49f..423ff07e2ab 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml b/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml index 4a646c4078a..59e1fdfc687 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 9d79ac35845..268321da26b 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 5744bbbbf71..dd35154f804 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index fe43d65faeb..6f0b05fad28 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 5bb1b54ea29..f6cb9787b3f 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 25fb9d37eb3..24841e21d35 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -9,7 +9,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 @@ -53,336 +53,336 @@ org.eclipse.jetty apache-jsp - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty apache-jstl - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-alpn-client - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-alpn-java-client - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-alpn-java-server - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-alpn-openjdk8-client - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-alpn-openjdk8-server - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-alpn-conscrypt-client - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-alpn-conscrypt-server - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-alpn-server - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-annotations - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-ant - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-client - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-continuation - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-deploy - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-distribution - 9.4.29-SNAPSHOT + 9.4.29.v20200521 zip org.eclipse.jetty jetty-distribution - 9.4.29-SNAPSHOT + 9.4.29.v20200521 tar.gz org.eclipse.jetty.fcgi fcgi-client - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.fcgi fcgi-server - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-home - 9.4.29-SNAPSHOT + 9.4.29.v20200521 zip org.eclipse.jetty jetty-home - 9.4.29-SNAPSHOT + 9.4.29.v20200521 tar.gz org.eclipse.jetty jetty-http - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.http2 http2-client - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.http2 http2-common - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.http2 http2-hpack - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.http2 http2-http-client-transport - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.http2 http2-server - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-http-spi - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty infinispan-common - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty infinispan-remote-query - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty infinispan-embedded-query - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-hazelcast - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-io - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-jaas - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-jaspi - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-jmx - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-jndi - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.memcached jetty-memcached-sessions - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-nosql - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.osgi jetty-osgi-boot - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.osgi jetty-httpservice - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-plus - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-proxy - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-quickstart - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-rewrite - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-security - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-openid - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-server - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-servlet - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-servlets - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-spring - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-unixsocket - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-util - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-util-ajax - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-webapp - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.websocket javax-websocket-client-impl - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.websocket javax-websocket-server-impl - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.websocket websocket-api - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.websocket websocket-client - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.websocket websocket-common - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.websocket websocket-server - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty.websocket websocket-servlet - 9.4.29-SNAPSHOT + 9.4.29.v20200521 org.eclipse.jetty jetty-xml - 9.4.29-SNAPSHOT + 9.4.29.v20200521 diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 192eeba6002..be078af41ce 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 76409b9bfa7..801de2fc76e 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 0c1e7a6540d..9a4b6cc34ae 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index aac2955999a..b70712b0529 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 1e60b7b3190..82f2400494d 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-distribution diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml index 62da69a54b1..48c07479ec4 100644 --- a/jetty-documentation/pom.xml +++ b/jetty-documentation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 jetty-documentation Jetty :: Documentation diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index 8519df4d6f2..a0ccde50b09 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 72775eaae08..82e1cd52e70 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index 93483624a72..3aa17095190 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 07bc061d319..32ff10ac7da 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index db7045d9a4a..f3132c971e9 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index 33fc3863baa..d00416504c7 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index e97c7dbf02f..520e3f1e95f 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index bc4f4b040bd..7dd188ad63a 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index d5c97ec4f16..db7ec5c5644 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-http diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index d397a5e22d1..db20cb8218b 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index b57b00b5a24..bb8ca86c719 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index a8e58c545b7..2a40e987988 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index add16c2afd1..331304ce56b 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index 3f8490b9ab8..2c82b6989c6 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 77eb61f3b35..d94ebad7d88 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index d11f82a9f25..c1726a2f61b 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index 620748bdb67..aad511097ac 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 infinispan-common diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index d2555f9d845..587d3364dd4 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index f33d4474e97..04602741f6e 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 infinispan-embedded diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index 4cb8d9bbb6a..5d6d55913b4 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index 63235a66170..f16050564b7 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 75103e182df..82db4ae4350 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 5efa95c6c7e..b8eaed018b3 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 72b221acfc5..72f5c92c068 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index eb3f6deedc1..e25bd8a11f3 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-jmh/pom.xml b/jetty-jmh/pom.xml index ab479d23d85..46f52e8664e 100644 --- a/jetty-jmh/pom.xml +++ b/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 3a650bd610b..2e44b2b53c5 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 5a8c24718a2..74b8408491f 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-jndi diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index c75714cf367..8c3cbb29e86 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index ff00b926c2d..55d955a5a99 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 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 270f026712a..74e2b10d10c 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index e96cf2d6061..a2ed70b2435 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 8b6c28b4465..15504b4d1d9 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 32f4dda6715..4f9c95e5683 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 921e25a3a70..6cef6fc11aa 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.29-SNAPSHOT + 9.4.29.v20200521 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 f9214dab3b1..8744773dc2f 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.29-SNAPSHOT + 9.4.29.v20200521 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 ba3721467c0..fd55cc944d5 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.29-SNAPSHOT + 9.4.29.v20200521 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index e31b62d64d7..bce0accc623 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.29-SNAPSHOT + 9.4.29.v20200521 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 4d20c4f092a..dd763ba3568 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index eade9567f7e..4492f1321f6 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 5cc2e8d5fea..6ad1567e934 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.29-SNAPSHOT + 9.4.29.v20200521 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 ff6c269a776..ce7125e8387 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.29-SNAPSHOT + 9.4.29.v20200521 ../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 1ca62e2f40f..56cc7c511d0 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.29-SNAPSHOT + 9.4.29.v20200521 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 a2c965a77a2..582bb496d37 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.29-SNAPSHOT + 9.4.29.v20200521 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 4bfcd4ea4f8..2b5dc1438c0 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.29-SNAPSHOT + 9.4.29.v20200521 ../pom.xml 4.0.0 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 40959c65258..aa2283f5580 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 43cc78553d8..b2d3a2f10bb 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-proxy diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 8b9619227d0..a4af19179ba 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 org.eclipse.jetty diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 2d9265edf06..d51e608017b 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 4bd67315249..68087d1dee4 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 8a74827cb50..9f7e054a745 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 8e549a01400..cde53f550cf 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 54eee174c55..5ee46f24f08 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 4a97a896d45..55b095ec4cb 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-servlets diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 6bbbbfb8752..050098239eb 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index e4f9c8adda1..9c34bcd1078 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-start diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 5f7bfe1722d..1cc142a97cf 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-unixsocket diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index bb793877902..53bdcca695e 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 8c4eed9715e..cf98fb8566b 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index f405910ae23..275c5febb47 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 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 045ef095e7b..b7df9e27860 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml index abeb0bc434e..42b3700471c 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-websocket/jetty-websocket-tests/pom.xml b/jetty-websocket/jetty-websocket-tests/pom.xml index ac4e5befd7b..cf211116780 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 1215318c6c7..d64de08be04 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 975d700d283..1917cc3671e 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index a5c7894f114..0339ce5e92d 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index ced91037eab..a8225873a0b 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index 48ec0c302cc..fc81d4f36f3 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 52759d5c128..a2bea8efcf4 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 5c1653c42cd..405b0843332 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index b8986db6a86..b7d0a991c73 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/pom.xml b/tests/pom.xml index c13d4db6ea4..2c399a0c77e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.4.29-SNAPSHOT + 9.4.29.v20200521 ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index 1494e53b224..384786bac12 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.29-SNAPSHOT + 9.4.29.v20200521 ../pom.xml 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 85d592e07c6..1bbcd8b131c 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 55fc990bddc..2d2acd0842e 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 6a1feabddbc..6dc699bae03 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.29-SNAPSHOT + 9.4.29.v20200521 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 5046fcdde62..918bae001ef 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.29-SNAPSHOT + 9.4.29.v20200521 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 01c5fdc2fe0..2f0f3d49346 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.29-SNAPSHOT + 9.4.29.v20200521 jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index 0604c93a4c9..33a2fab6a66 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 test-jmx-parent diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index e64495991a7..4cf3f85e9e5 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.29-SNAPSHOT + 9.4.29.v20200521 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index a748977848b..3e4cfbfd78c 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.29-SNAPSHOT + 9.4.29.v20200521 ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 0ca22dcd1c2..e2a353c045d 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.29-SNAPSHOT + 9.4.29.v20200521 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 b828eb93c93..febc24f80b3 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.29-SNAPSHOT + 9.4.29.v20200521 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 ae19f2de755..e740ea941b6 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.29-SNAPSHOT + 9.4.29.v20200521 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 56db185935a..a4164dc4f62 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.29-SNAPSHOT + 9.4.29.v20200521 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 ba31c16285f..f42af52e40c 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.29-SNAPSHOT + 9.4.29.v20200521 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 1b60ce85229..fe2c887e8d4 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.29-SNAPSHOT + 9.4.29.v20200521 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 2a691adc0f6..f8964fce9b3 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.29-SNAPSHOT + 9.4.29.v20200521 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 ade0d5a343b..9bacbc7d259 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.29-SNAPSHOT + 9.4.29.v20200521 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 aa45c63cc2a..a534e5df8ee 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.29-SNAPSHOT + 9.4.29.v20200521 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index e69c4c8566a..4bb674b1469 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.29-SNAPSHOT + 9.4.29.v20200521 ../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 7a10f068c71..be0ad0aeae3 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index e170509eff9..ed58abb0fbe 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index a7e2a1c358c..a3b84d89b4f 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml index 82adc28bbfc..d6f2251b982 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.29-SNAPSHOT + 9.4.29.v20200521 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 e37b5b22de6..c7383f610fd 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.29-SNAPSHOT + 9.4.29.v20200521 ../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 07c04f866e9..848eae6c11e 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.29-SNAPSHOT + 9.4.29.v20200521 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 0607935a35f..c9db8291d53 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.29-SNAPSHOT + 9.4.29.v20200521 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 a673347d33e..c6819695b22 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml index 884d0b1afab..acae710987a 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.29-SNAPSHOT + 9.4.29.v20200521 ../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 2dec350ab6c..1e44e3e3581 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.29-SNAPSHOT + 9.4.29.v20200521 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 efd55e56e25..229b3e9558f 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.29-SNAPSHOT + 9.4.29.v20200521 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 71aa95c4066..ede32dfcc05 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.29-SNAPSHOT + 9.4.29.v20200521 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 a225644e50c..a5e54b009e7 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.29-SNAPSHOT + 9.4.29.v20200521 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 ddea1b73710..16289299d84 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.29-SNAPSHOT + 9.4.29.v20200521 test-simple-webapp diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 11f24e990bd..3dbc91e7436 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.29-SNAPSHOT + 9.4.29.v20200521 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 32013b4fe89..69164f00955 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.29-SNAPSHOT + 9.4.29.v20200521 4.0.0 From 5d6f3e2ddc0832e6107543dfd9858c9c6b0c8d6e Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 21 May 2020 13:42:25 -0500 Subject: [PATCH 04/17] Updating to version 9.4.30-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 009f6013f1a..ec0c39fc05d 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-9.4.30-SNAPSHOT + jetty-9.4.29.v20200521 - 21 May 2020 + 2188 Lock contention creating HTTP/2 streams + 4235 communicate the reason of failure to the OpenID error page diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index 5a27d149698..19627dc1a0a 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.29.v20200521 + 9.4.30-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 1524b48dfc3..a44bf82d2d7 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 2d75087709a..e67340f0561 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 apache-jsp diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index 295b9f53d9c..ab6f8643902 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 apache-jstl diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 46b88407b79..2c0b4401442 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.29.v20200521 + 9.4.30-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 288785f42d5..0d8656fcd47 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.29.v20200521 + 9.4.30-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 040aaec8303..531495d6d6f 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index f40892d591d..f90ea27236c 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 17734a264f4..c9882987422 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.4.29.v20200521 + 9.4.30-SNAPSHOT ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 8d3fc417bc6..b5985e89716 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index bccf8a700db..38192c766fa 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.29.v20200521 + 9.4.30-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 daef0477762..ecb9f6e1ea5 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.29.v20200521 + 9.4.30-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 2f395f4d1ed..363ef215ea9 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.29.v20200521 + 9.4.30-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 c790d1ff1ae..bfe7c9adbfb 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.29.v20200521 + 9.4.30-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 341d8b1a99a..f86286c2739 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.29.v20200521 + 9.4.30-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 423ff07e2ab..b96b43e811a 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.29.v20200521 + 9.4.30-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 59e1fdfc687..25b68c8b2df 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 268321da26b..8abaae6142d 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index dd35154f804..5f64c50f1a2 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 6f0b05fad28..5307e86146c 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index f6cb9787b3f..2c9cc5878c4 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 24841e21d35..88250c98eef 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -9,7 +9,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT @@ -53,336 +53,336 @@ org.eclipse.jetty apache-jsp - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty apache-jstl - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-alpn-client - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-alpn-java-client - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-alpn-java-server - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-alpn-openjdk8-client - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-alpn-openjdk8-server - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-client - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-server - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-alpn-server - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-annotations - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-ant - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-client - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-continuation - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-deploy - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-distribution - 9.4.29.v20200521 + 9.4.30-SNAPSHOT zip org.eclipse.jetty jetty-distribution - 9.4.29.v20200521 + 9.4.30-SNAPSHOT tar.gz org.eclipse.jetty.fcgi fcgi-client - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.fcgi fcgi-server - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-home - 9.4.29.v20200521 + 9.4.30-SNAPSHOT zip org.eclipse.jetty jetty-home - 9.4.29.v20200521 + 9.4.30-SNAPSHOT tar.gz org.eclipse.jetty jetty-http - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.http2 http2-client - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.http2 http2-common - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.http2 http2-hpack - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.http2 http2-http-client-transport - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.http2 http2-server - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-http-spi - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty infinispan-common - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty infinispan-remote-query - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty infinispan-embedded-query - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-hazelcast - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-io - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-jaas - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-jaspi - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-jmx - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-jndi - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.memcached jetty-memcached-sessions - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-nosql - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.osgi jetty-httpservice - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-plus - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-proxy - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-quickstart - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-rewrite - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-security - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-openid - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-server - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-servlet - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-servlets - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-spring - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-unixsocket - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-util - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-util-ajax - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-webapp - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.websocket javax-websocket-client-impl - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.websocket javax-websocket-server-impl - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.websocket websocket-api - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.websocket websocket-client - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.websocket websocket-common - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.websocket websocket-server - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty.websocket websocket-servlet - 9.4.29.v20200521 + 9.4.30-SNAPSHOT org.eclipse.jetty jetty-xml - 9.4.29.v20200521 + 9.4.30-SNAPSHOT diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index be078af41ce..5f195a05203 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 801de2fc76e..4994894d4e4 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 9a4b6cc34ae..f7df28c549a 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index b70712b0529..ad8277204f0 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 82f2400494d..2c0fc3a9ecd 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-distribution diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml index 48c07479ec4..949077cc623 100644 --- a/jetty-documentation/pom.xml +++ b/jetty-documentation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT jetty-documentation Jetty :: Documentation diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index a0ccde50b09..6eeba32210b 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 82e1cd52e70..2c3d43fa56f 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index 3aa17095190..c7722607f1e 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-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 32ff10ac7da..6f06e4603bc 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index f3132c971e9..22461b9c5e0 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index d00416504c7..a1929600e04 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 520e3f1e95f..f6c1602642a 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 7dd188ad63a..f967c5b06cb 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index db7ec5c5644..ebd567b29b1 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29.v20200521 + 9.4.30-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 db20cb8218b..b2ab4bc423d 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index bb8ca86c719..f4ada14f09e 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 2a40e987988..01058c481ca 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 331304ce56b..94de2632c00 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.29.v20200521 + 9.4.30-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 2c82b6989c6..e0c85976e60 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index d94ebad7d88..55226c52499 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index c1726a2f61b..fc8972c2c68 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index aad511097ac..46ec6df09c6 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.29.v20200521 + 9.4.30-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 587d3364dd4..6c9f367aed1 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index 04602741f6e..5130dd2f6ef 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.29.v20200521 + 9.4.30-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 5d6d55913b4..0003b9c67c4 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index f16050564b7..30796a0c9e5 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 82db4ae4350..fa12d193a1e 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index b8eaed018b3..6228d3a57c0 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 72f5c92c068..af4099f1476 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index e25bd8a11f3..d221e40df71 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-jmh/pom.xml b/jetty-jmh/pom.xml index 46f52e8664e..aaf78a8c53b 100644 --- a/jetty-jmh/pom.xml +++ b/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 2e44b2b53c5..6c16e0b42b8 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 74b8408491f..6cf3c478b65 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 8c3cbb29e86..ac255f8fa55 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 55d955a5a99..9c12c55e8a0 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-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 74e2b10d10c..fef40a31bd1 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index a2ed70b2435..83ed94f59b8 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 15504b4d1d9..cc4aa30c88d 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 4f9c95e5683..dd494834763 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 6cef6fc11aa..2d768ec7e67 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.29.v20200521 + 9.4.30-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 8744773dc2f..d851f8ab19b 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.29.v20200521 + 9.4.30-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 fd55cc944d5..05422b44eed 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.29.v20200521 + 9.4.30-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 bce0accc623..e7fcf5c539c 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.29.v20200521 + 9.4.30-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 dd763ba3568..0cdb74deb14 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 4492f1321f6..db1c9237515 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-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 6ad1567e934..bd7d5e5e1e5 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.29.v20200521 + 9.4.30-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 ce7125e8387..1a520f830a3 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.29.v20200521 + 9.4.30-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 56cc7c511d0..a8671e31435 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.29.v20200521 + 9.4.30-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 582bb496d37..d80ca168896 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.29.v20200521 + 9.4.30-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 2b5dc1438c0..0cb455e6644 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.29.v20200521 + 9.4.30-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index aa2283f5580..96d84003b6f 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index b2d3a2f10bb..787ddf6b7cb 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-proxy diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index a4af19179ba..1e8ffe21677 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index d51e608017b..a02ef67dff8 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 68087d1dee4..47ee5853da7 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 9f7e054a745..4ebda80383d 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index cde53f550cf..d571f5a0cc4 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 5ee46f24f08..287f82b64cb 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 55b095ec4cb..3d90f75be85 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 050098239eb..2451c70c63d 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 9c34bcd1078..fb15e4e7a92 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 1cc142a97cf..454ee582bcf 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-unixsocket diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 53bdcca695e..cf1cd084c11 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index cf98fb8566b..a428ec6e985 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 275c5febb47..516df08336b 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-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 b7df9e27860..1d5bd11f43c 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.29.v20200521 + 9.4.30-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 42b3700471c..4f830672efe 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/jetty-websocket-tests/pom.xml b/jetty-websocket/jetty-websocket-tests/pom.xml index cf211116780..427ca3f6d71 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index d64de08be04..c68098170c1 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 1917cc3671e..caef2d7427c 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index 0339ce5e92d..a6d3e0926c7 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index a8225873a0b..e301836b307 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index fc81d4f36f3..0f24a948577 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index a2bea8efcf4..3b3402d140d 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 405b0843332..32836152bab 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index b7d0a991c73..f46bfd8e471 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/pom.xml b/tests/pom.xml index 2c399a0c77e..7f484aea18c 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.4.29.v20200521 + 9.4.30-SNAPSHOT ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index 384786bac12..bb383b3426b 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.29.v20200521 + 9.4.30-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 1bbcd8b131c..f488019325a 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 2d2acd0842e..2b8a2fd9324 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 6dc699bae03..fe6cf597a5d 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.29.v20200521 + 9.4.30-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 918bae001ef..f3837572a1d 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.29.v20200521 + 9.4.30-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 2f0f3d49346..f07e5ae684b 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.29.v20200521 + 9.4.30-SNAPSHOT jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index 33a2fab6a66..e4f40c7901b 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 test-jmx-parent diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 4cf3f85e9e5..cefcc7dfcee 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.29.v20200521 + 9.4.30-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 3e4cfbfd78c..53402a35c5b 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.29.v20200521 + 9.4.30-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index e2a353c045d..cc5fa73ee31 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.29.v20200521 + 9.4.30-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 febc24f80b3..05e9cf030ce 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.29.v20200521 + 9.4.30-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 e740ea941b6..b09b7bc8179 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.29.v20200521 + 9.4.30-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 a4164dc4f62..b38e8961233 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.29.v20200521 + 9.4.30-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 f42af52e40c..e51920e3276 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.29.v20200521 + 9.4.30-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 fe2c887e8d4..5afd5a55d69 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.29.v20200521 + 9.4.30-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 f8964fce9b3..015264a0c81 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.29.v20200521 + 9.4.30-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 9bacbc7d259..7ca4b0311e5 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.29.v20200521 + 9.4.30-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 a534e5df8ee..f4dcbc820cd 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.29.v20200521 + 9.4.30-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 4bb674b1469..f28bb41696e 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.29.v20200521 + 9.4.30-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 be0ad0aeae3..cfbce8e433e 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.29.v20200521 + 9.4.30-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 ed58abb0fbe..921d8b8a20c 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.29.v20200521 + 9.4.30-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 a3b84d89b4f..6124c78844d 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.29.v20200521 + 9.4.30-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 d6f2251b982..0bf1980f984 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.29.v20200521 + 9.4.30-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 c7383f610fd..dde6c38cee8 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.29.v20200521 + 9.4.30-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 848eae6c11e..5926d0c191b 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.29.v20200521 + 9.4.30-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 c9db8291d53..83f0ccf406b 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.29.v20200521 + 9.4.30-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 c6819695b22..38fa5d0084b 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.29.v20200521 + 9.4.30-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 acae710987a..9af777ed222 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.29.v20200521 + 9.4.30-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 1e44e3e3581..021892c725c 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.29.v20200521 + 9.4.30-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 229b3e9558f..4a0fcbd86f8 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.29.v20200521 + 9.4.30-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 ede32dfcc05..b5090948173 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.29.v20200521 + 9.4.30-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 a5e54b009e7..90973abebb1 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.29.v20200521 + 9.4.30-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 16289299d84..83f80b9470b 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.29.v20200521 + 9.4.30-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 3dbc91e7436..aade486f5d9 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.29.v20200521 + 9.4.30-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 69164f00955..473d90e6011 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.29.v20200521 + 9.4.30-SNAPSHOT 4.0.0 From 74f9b464a6a7c3ddbb026988a0e490607f171870 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 22 May 2020 10:49:42 +1000 Subject: [PATCH 05/17] Issue #4873 - generalize test for all ThreadPools Signed-off-by: Lachlan Roberts --- .../util/thread/AbstractThreadPoolTest.java | 28 +++++++++++++++++++ .../util/thread/ExecutorThreadPoolTest.java | 24 ---------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/AbstractThreadPoolTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/AbstractThreadPoolTest.java index cfdd556f063..c321d4f4aa5 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/AbstractThreadPoolTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/AbstractThreadPoolTest.java @@ -18,7 +18,11 @@ package org.eclipse.jetty.util.thread; +import java.time.Duration; + import org.eclipse.jetty.util.ProcessorUtils; +import org.eclipse.jetty.util.component.ContainerLifeCycle; +import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.thread.ThreadPool.SizedThreadPool; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterAll; @@ -26,6 +30,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; import static org.junit.jupiter.api.Assertions.fail; public abstract class AbstractThreadPoolTest @@ -87,4 +93,26 @@ public abstract class AbstractThreadPoolTest assertThat(pool.getMaxThreads(), Matchers.is(3)); } + + @Test + public void testJoinWithStopTimeout() + { + // ThreadPool must be an implement ContainerLifeCycle for this test to be valid. + SizedThreadPool threadPool = newPool(3); + if (!(threadPool instanceof ContainerLifeCycle)) + return; + + final long stopTimeout = 100; + ((ContainerLifeCycle)threadPool).setStopTimeout(100); + LifeCycle.start(threadPool); + + // Verify that join does not timeout after waiting twice the stopTimeout. + assertThrows(Throwable.class, () -> + assertTimeoutPreemptively(Duration.ofMillis(stopTimeout * 2), threadPool::join) + ); + + // After stopping the ThreadPool join should unblock. + LifeCycle.stop(threadPool); + assertTimeoutPreemptively(Duration.ofMillis(stopTimeout), threadPool::join); + } } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ExecutorThreadPoolTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ExecutorThreadPoolTest.java index a495d719bb0..95ab6a22aab 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ExecutorThreadPoolTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/ExecutorThreadPoolTest.java @@ -18,13 +18,7 @@ package org.eclipse.jetty.util.thread; -import java.time.Duration; - import org.eclipse.jetty.util.thread.ThreadPool.SizedThreadPool; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; public class ExecutorThreadPoolTest extends AbstractThreadPoolTest { @@ -33,22 +27,4 @@ public class ExecutorThreadPoolTest extends AbstractThreadPoolTest { return new ExecutorThreadPool(max); } - - @Test - public void testJoin() throws Exception - { - final long stopTimeout = 100; - ExecutorThreadPool executorThreadPool = new ExecutorThreadPool(10); - executorThreadPool.setStopTimeout(stopTimeout); - executorThreadPool.start(); - - // Verify that join does not timeout after waiting twice the stopTimeout. - assertThrows(Throwable.class, () -> - assertTimeoutPreemptively(Duration.ofMillis(stopTimeout * 2), executorThreadPool::join) - ); - - // After stopping the ThreadPool join should unblock. - executorThreadPool.stop(); - assertTimeoutPreemptively(Duration.ofMillis(stopTimeout), executorThreadPool::join); - } } From 28a588b8bd7c08499c9a695e822b961919ab443a Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 25 May 2020 12:27:49 +1000 Subject: [PATCH 06/17] Issue #4903 - Better errors for non public endpoints Signed-off-by: Lachlan Roberts --- .../websocket/jsr356/server/JsrCreator.java | 3 +- .../jsr356/server/ServerContainer.java | 55 ++++--- .../jsr356/server/PrivateEndpointTest.java | 147 ++++++++++++++++++ 3 files changed, 178 insertions(+), 27 deletions(-) create mode 100644 jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PrivateEndpointTest.java diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java index aa5341d7ffe..990ebc25ef0 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JsrCreator.java @@ -159,8 +159,7 @@ public class JsrCreator implements WebSocketCreator } catch (InstantiationException e) { - if (LOG.isDebugEnabled()) - LOG.debug("Unable to create websocket: " + config.getEndpointClass().getName(), e); + LOG.warn("Unable to create websocket: " + config.getEndpointClass().getName(), e); return null; } } diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java index 9db239b7905..6365d92be71 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java @@ -18,6 +18,7 @@ package org.eclipse.jetty.websocket.jsr356.server; +import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Executor; @@ -137,6 +138,9 @@ public class ServerContainer extends ClientContainer implements javax.websocket. private void addEndpoint(ServerEndpointMetadata metadata) throws DeploymentException { + if (!Modifier.isPublic(metadata.getEndpointClass().getModifiers())) + throw new DeploymentException("Class modifier must be public"); + JsrCreator creator = new JsrCreator(this, metadata, this.configuration.getFactory().getExtensionFactory()); this.configuration.addMapping("uri-template|" + metadata.getPath(), creator); } @@ -191,35 +195,36 @@ public class ServerContainer extends ClientContainer implements javax.websocket. public ServerEndpointMetadata getServerEndpointMetadata(final Class endpoint, final ServerEndpointConfig config) throws DeploymentException { - ServerEndpointMetadata metadata = null; + try + { + ServerEndpointMetadata metadata; + ServerEndpoint anno = endpoint.getAnnotation(ServerEndpoint.class); + if (anno != null) + { + // Annotated takes precedence here + AnnotatedServerEndpointMetadata ametadata = new AnnotatedServerEndpointMetadata(this, endpoint, config); + AnnotatedEndpointScanner scanner = new AnnotatedEndpointScanner<>(ametadata); + metadata = ametadata; + scanner.scan(); + } + else if (Endpoint.class.isAssignableFrom(endpoint)) + { + // extends Endpoint + @SuppressWarnings("unchecked") + Class eendpoint = (Class)endpoint; + metadata = new SimpleServerEndpointMetadata(eendpoint, config); + } + else + { + throw new DeploymentException("Unable to identify as valid Endpoint: " + endpoint); + } - ServerEndpoint anno = endpoint.getAnnotation(ServerEndpoint.class); - if (anno != null) - { - // Annotated takes precedence here - AnnotatedServerEndpointMetadata ametadata = new AnnotatedServerEndpointMetadata(this, endpoint, config); - AnnotatedEndpointScanner scanner = new AnnotatedEndpointScanner<>(ametadata); - metadata = ametadata; - scanner.scan(); + return metadata; } - else if (Endpoint.class.isAssignableFrom(endpoint)) + catch (RuntimeException e) { - // extends Endpoint - @SuppressWarnings("unchecked") - Class eendpoint = (Class)endpoint; - metadata = new SimpleServerEndpointMetadata(eendpoint, config); + throw new DeploymentException(e.getMessage(), e); } - else - { - StringBuilder err = new StringBuilder(); - err.append("Not a recognized websocket ["); - err.append(endpoint.getName()); - err.append("] does not extend @").append(ServerEndpoint.class.getName()); - err.append(" or extend from ").append(Endpoint.class.getName()); - throw new DeploymentException("Unable to identify as valid Endpoint: " + endpoint); - } - - return metadata; } @Override diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PrivateEndpointTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PrivateEndpointTest.java new file mode 100644 index 00000000000..79d7b771664 --- /dev/null +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PrivateEndpointTest.java @@ -0,0 +1,147 @@ +// +// ======================================================================== +// 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.jsr356.server; + +import javax.websocket.ContainerProvider; +import javax.websocket.DeploymentException; +import javax.websocket.Endpoint; +import javax.websocket.EndpointConfig; +import javax.websocket.MessageHandler; +import javax.websocket.OnMessage; +import javax.websocket.Session; +import javax.websocket.WebSocketContainer; +import javax.websocket.server.ServerEndpoint; +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.component.LifeCycle; +import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer; +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.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class PrivateEndpointTest +{ + private Server server; + private WebSocketContainer client; + private ServletContextHandler contextHandler; + + @BeforeEach + public void before() + { + server = new Server(); + ServerConnector connector = new ServerConnector(server); + server.addConnector(connector); + + contextHandler = new ServletContextHandler(); + contextHandler.setContextPath("/"); + server.setHandler(contextHandler); + client = ContainerProvider.getWebSocketContainer(); + } + + @AfterEach + public void after() throws Exception + { + LifeCycle.stop(client); + server.stop(); + } + + public interface CheckedConsumer + { + void accept(T t) throws DeploymentException; + } + + public void start(CheckedConsumer containerConsumer) throws Exception + { + WebSocketServerContainerInitializer.configure(contextHandler, (context, container) -> containerConsumer.accept(container)); + server.start(); + } + + private static class ServerSocket extends Endpoint implements MessageHandler.Whole + { + @Override + public void onOpen(Session session, EndpointConfig config) + { + session.addMessageHandler(this); + } + + @Override + public void onMessage(String message) + { + } + } + + @ServerEndpoint("/annotated") + private static class AnnotatedServerSocket + { + @OnMessage + public void onMessage(String message) + { + } + } + + @ServerEndpoint("/annotatedMethod") + public static class AnnotatedServerMethod + { + @OnMessage + private void onMessage(String message) + { + } + } + + @Test + public void testEndpoint() + { + RuntimeException error = assertThrows(RuntimeException.class, () -> + start(container -> container.addEndpoint(ServerEndpointConfig.Builder.create(ServerSocket.class, "/").build()))); + + assertThat(error.getCause(), instanceOf(DeploymentException.class)); + DeploymentException deploymentException = (DeploymentException)error.getCause(); + assertThat(deploymentException.getMessage(), containsString("Class modifier must be public")); + } + + @Test + public void testAnnotatedEndpoint() + { + RuntimeException error = assertThrows(RuntimeException.class, () -> + start(container -> container.addEndpoint(AnnotatedServerSocket.class))); + + assertThat(error.getCause(), instanceOf(DeploymentException.class)); + DeploymentException deploymentException = (DeploymentException)error.getCause(); + assertThat(deploymentException.getMessage(), containsString("Class modifier must be public")); + } + + @Test + public void testAnnotatedMethod() + { + RuntimeException error = assertThrows(RuntimeException.class, () -> + start(container -> container.addEndpoint(AnnotatedServerMethod.class))); + + assertThat(error.getCause(), instanceOf(DeploymentException.class)); + DeploymentException deploymentException = (DeploymentException)error.getCause(); + assertThat(deploymentException.getMessage(), containsString("Method modifier must be public")); + } +} From add00c9dd8750c4e97508ac0ab6fbe84f9d0b82a Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 25 May 2020 13:57:41 +1000 Subject: [PATCH 07/17] Issue #4903 - check endpoint class is default constructable Signed-off-by: Lachlan Roberts --- .../jsr356/server/ServerContainer.java | 6 ++-- .../jsr356/server/PrivateEndpointTest.java | 32 +++++++++++++++++-- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java index 6365d92be71..f0cca5e66af 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java @@ -18,7 +18,6 @@ package org.eclipse.jetty.websocket.jsr356.server; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Executor; @@ -35,6 +34,7 @@ import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.common.events.EventDriverFactory; +import org.eclipse.jetty.websocket.common.util.ReflectUtils; import org.eclipse.jetty.websocket.jsr356.ClientContainer; import org.eclipse.jetty.websocket.jsr356.JsrSessionFactory; import org.eclipse.jetty.websocket.jsr356.annotations.AnnotatedEndpointScanner; @@ -138,8 +138,8 @@ public class ServerContainer extends ClientContainer implements javax.websocket. private void addEndpoint(ServerEndpointMetadata metadata) throws DeploymentException { - if (!Modifier.isPublic(metadata.getEndpointClass().getModifiers())) - throw new DeploymentException("Class modifier must be public"); + if (!ReflectUtils.isDefaultConstructable(metadata.getEndpointClass())) + throw new DeploymentException("Cannot access default constructor for the Endpoint class"); JsrCreator creator = new JsrCreator(this, metadata, this.configuration.getFactory().getExtensionFactory()); this.configuration.addMapping("uri-template|" + metadata.getPath(), creator); diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PrivateEndpointTest.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PrivateEndpointTest.java index 79d7b771664..33e7b349590 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PrivateEndpointTest.java +++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PrivateEndpointTest.java @@ -94,6 +94,21 @@ public class PrivateEndpointTest } } + @SuppressWarnings("InnerClassMayBeStatic") + public class ServerSocketNonStatic extends Endpoint implements MessageHandler.Whole + { + @Override + public void onOpen(Session session, EndpointConfig config) + { + session.addMessageHandler(this); + } + + @Override + public void onMessage(String message) + { + } + } + @ServerEndpoint("/annotated") private static class AnnotatedServerSocket { @@ -120,7 +135,18 @@ public class PrivateEndpointTest assertThat(error.getCause(), instanceOf(DeploymentException.class)); DeploymentException deploymentException = (DeploymentException)error.getCause(); - assertThat(deploymentException.getMessage(), containsString("Class modifier must be public")); + assertThat(deploymentException.getMessage(), containsString("Cannot access default constructor for the Endpoint class")); + } + + @Test + public void testInnerEndpoint() + { + RuntimeException error = assertThrows(RuntimeException.class, () -> + start(container -> container.addEndpoint(ServerEndpointConfig.Builder.create(ServerSocketNonStatic.class, "/").build()))); + + assertThat(error.getCause(), instanceOf(DeploymentException.class)); + DeploymentException deploymentException = (DeploymentException)error.getCause(); + assertThat(deploymentException.getMessage(), containsString("Cannot access default constructor for the Endpoint class")); } @Test @@ -131,7 +157,7 @@ public class PrivateEndpointTest assertThat(error.getCause(), instanceOf(DeploymentException.class)); DeploymentException deploymentException = (DeploymentException)error.getCause(); - assertThat(deploymentException.getMessage(), containsString("Class modifier must be public")); + assertThat(deploymentException.getMessage(), containsString("Cannot access default constructor for the Endpoint class")); } @Test @@ -144,4 +170,4 @@ public class PrivateEndpointTest DeploymentException deploymentException = (DeploymentException)error.getCause(); assertThat(deploymentException.getMessage(), containsString("Method modifier must be public")); } -} +} \ No newline at end of file From 470d948504daef688da39a8038a5ee8da6ff43e4 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 26 May 2020 09:35:17 +1000 Subject: [PATCH 08/17] Issue #4903 - changes from review Signed-off-by: Lachlan Roberts --- .../jetty/websocket/jsr356/server/ServerContainer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java index f0cca5e66af..167c4e2befe 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java @@ -130,7 +130,7 @@ public class ServerContainer extends ClientContainer implements javax.websocket. { if (deferredEndpointClasses == null) { - deferredEndpointClasses = new ArrayList>(); + deferredEndpointClasses = new ArrayList<>(); } deferredEndpointClasses.add(endpointClass); } @@ -161,7 +161,7 @@ public class ServerContainer extends ClientContainer implements javax.websocket. { if (deferredEndpointConfigs == null) { - deferredEndpointConfigs = new ArrayList(); + deferredEndpointConfigs = new ArrayList<>(); } deferredEndpointConfigs.add(config); } @@ -216,7 +216,10 @@ public class ServerContainer extends ClientContainer implements javax.websocket. } else { - throw new DeploymentException("Unable to identify as valid Endpoint: " + endpoint); + String err = "Not a recognized websocket [" + endpoint.getName() + + "] does not extend @" + ServerEndpoint.class.getName() + + " or extend from " + Endpoint.class.getName(); + throw new DeploymentException(err); } return metadata; From c41560c7cd30f9ce5e79fd307763b1e6f9072817 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 26 May 2020 15:35:39 +1000 Subject: [PATCH 09/17] Issue #4903 - add cause to Exception when creating endpoint instance Signed-off-by: Lachlan Roberts --- .../jsr356/server/ContainerDefaultConfigurator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ContainerDefaultConfigurator.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ContainerDefaultConfigurator.java index e25916d5170..0fc08fe2622 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ContainerDefaultConfigurator.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ContainerDefaultConfigurator.java @@ -72,7 +72,10 @@ public final class ContainerDefaultConfigurator extends Configurator } catch (Exception e) { - throw new InstantiationException(String.format("%s: %s", e.getClass().getName(), e.getMessage())); + String errorMsg = String.format("%s: %s", e.getClass().getName(), e.getMessage()); + InstantiationException instantiationException = new InstantiationException(errorMsg); + instantiationException.initCause(e); + throw instantiationException; } } From 5c63b0ef7810634378a977fb9d198558da07d657 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 26 May 2020 17:37:04 +1000 Subject: [PATCH 10/17] Issue #4903 - catch Throwable instead of RuntimeException Signed-off-by: Lachlan Roberts --- .../jetty/websocket/jsr356/server/ServerContainer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java index 167c4e2befe..3e2f3492873 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java @@ -224,9 +224,11 @@ public class ServerContainer extends ClientContainer implements javax.websocket. return metadata; } - catch (RuntimeException e) + catch (Throwable t) { - throw new DeploymentException(e.getMessage(), e); + if (t instanceof DeploymentException) + throw t; + throw new DeploymentException(t.getMessage(), t); } } From a11c7f554c50dc26d29b4b1d69ee5aabded80960 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Wed, 27 May 2020 09:42:44 +1000 Subject: [PATCH 11/17] Issue #4903 - cleanup catch statement from review Signed-off-by: Lachlan Roberts --- .../jetty/websocket/jsr356/server/ServerContainer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java index 3e2f3492873..4e79073c34f 100644 --- a/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java +++ b/jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java @@ -224,10 +224,12 @@ public class ServerContainer extends ClientContainer implements javax.websocket. return metadata; } + catch (DeploymentException e) + { + throw e; + } catch (Throwable t) { - if (t instanceof DeploymentException) - throw t; throw new DeploymentException(t.getMessage(), t); } } From c05bd6c26d036aced86defad8294a3dccd9f8f17 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Sat, 23 May 2020 15:09:28 +1000 Subject: [PATCH 12/17] use testcontainers/docker to run jdbc sessions tests with Mariadb remote Signed-off-by: olivier lamy --- .../jetty/server/session/DatabaseAdaptor.java | 25 +++- pom.xml | 5 +- .../test-sessions/test-jdbc-sessions/pom.xml | 63 +++++++++- .../jetty/server/session/JdbcTestHelper.java | 112 ++++++++++++------ .../session/SessionTableSchemaTest.java | 47 +++++--- .../test/resources/simplelogger.properties | 3 + 6 files changed, 202 insertions(+), 53 deletions(-) create mode 100644 tests/test-sessions/test-jdbc-sessions/src/test/resources/simplelogger.properties diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java index 82f39cf081c..4bcf2217530 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java @@ -60,6 +60,8 @@ public class DatabaseAdaptor private String _connectionUrl; private Driver _driver; private DataSource _datasource; + private String _username; + private String _password; private String _jndiName; @@ -257,6 +259,26 @@ public class DatabaseAdaptor return _connectionUrl; } + public String getUsername() + { + return _username; + } + + public void setUsername(String username) + { + this._username = username; + } + + public String getPassword() + { + return _password; + } + + public void setPassword(String password) + { + this._password = password; + } + public void initialize() throws Exception { @@ -302,7 +324,8 @@ public class DatabaseAdaptor if (_datasource != null) return _datasource.getConnection(); else - return DriverManager.getConnection(_connectionUrl); + return _username == null ? DriverManager.getConnection(_connectionUrl) + : DriverManager.getConnection(_connectionUrl, _username, _password); } /** diff --git a/pom.xml b/pom.xml index f46bfd8e471..91559f53c20 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,7 @@ ${project.build.directory}/local-repo src/it/settings.xml 0 + 1.14.2 @@ -1083,12 +1084,12 @@ org.testcontainers testcontainers - 1.14.1 + ${testcontainers.version} org.testcontainers junit-jupiter - 1.14.1 + ${testcontainers.version} diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 5afd5a55d69..3bec9345b71 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -8,9 +8,9 @@ test-jdbc-sessions Jetty Tests :: Sessions :: JDBC - http://www.eclipse.org/jetty ${project.groupId}.sessions.jdbc + 10.3.6 @@ -22,6 +22,15 @@ true + + org.apache.maven.plugins + maven-surefire-plugin + + + false + + + @@ -60,5 +69,57 @@ jetty-test-helper test + + org.testcontainers + testcontainers + test + + + org.testcontainers + mariadb + ${testcontainers.version} + test + + + org.testcontainers + junit-jupiter + test + + + org.slf4j + slf4j-simple + test + + + org.mariadb.jdbc + mariadb-java-client + 2.6.0 + test + + + + remote-session-tests + + + mariadb.enabled + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mariadb.docker.version} + true + + + + + + + diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java index ec9b2235e99..0affc485e3f 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java @@ -33,6 +33,11 @@ import java.util.Set; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.ClassLoadingObjectInputStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.MariaDBContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -42,9 +47,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; */ public class JdbcTestHelper { - public static final String DRIVER_CLASS = "org.apache.derby.jdbc.EmbeddedDriver"; - public static final String DEFAULT_CONNECTION_URL = "jdbc:derby:memory:sessions;create=true"; - public static final String DEFAULT_SHUTDOWN_URL = "jdbc:derby:memory:sessions;drop=true"; + public static final boolean USE_MARIADB = Boolean.getBoolean("mariadb.enabled"); + + private static final Logger LOG = LoggerFactory.getLogger(JdbcTestHelper.class); + private static final Logger MARIADB_LOG = LoggerFactory.getLogger("org.eclipse.jetty.server.session.MariaDbLogs"); + + public static String DRIVER_CLASS = "org.apache.derby.jdbc.EmbeddedDriver"; + public static String DEFAULT_CONNECTION_URL = "jdbc:derby:memory:sessions;create=true"; + public static String DEFAULT_SHUTDOWN_URL = "jdbc:derby:memory:sessions;drop=true"; public static final int STALE_INTERVAL = 1; public static final String EXPIRY_COL = "extime"; @@ -60,6 +70,33 @@ public class JdbcTestHelper public static final String COOKIE_COL = "cooktime"; public static final String CREATE_COL = "ctime"; + static MariaDBContainer MARIAD_DB = + new MariaDBContainer("mariadb:" + System.getProperty("mariadb.docker.version", "10.3.6")) + .withDatabaseName("sessions"); + + static + { + if (USE_MARIADB) + { + try + { + long start = System.currentTimeMillis(); + MARIAD_DB.withLogConsumer(new Slf4jLogConsumer(MARIADB_LOG)).start(); + String containerIpAddress = MARIAD_DB.getContainerIpAddress(); + int mariadbPort = MARIAD_DB.getMappedPort(3306); + DEFAULT_CONNECTION_URL = MARIAD_DB.getJdbcUrl(); + DRIVER_CLASS = MARIAD_DB.getDriverClassName(); + LOG.info("Mariadb container started for {}:{} - {}ms", containerIpAddress, mariadbPort, + System.currentTimeMillis() - start); + } + catch (Exception e) + { + LOG.error(e.getMessage(), e); + throw new RuntimeException(e.getMessage(), e); + } + } + } + static { System.setProperty("derby.system.home", MavenTestingUtils.getTargetFile("test-derby").getAbsolutePath()); @@ -68,6 +105,14 @@ public class JdbcTestHelper public static void shutdown(String connectionUrl) throws Exception { + if (USE_MARIADB) + { + try (Connection connection = getConnection()) + { + connection.prepareStatement("truncate table " + TABLE).executeUpdate(); + } + return; + } if (connectionUrl == null) connectionUrl = DEFAULT_SHUTDOWN_URL; @@ -84,14 +129,34 @@ public class JdbcTestHelper } } + public static DatabaseAdaptor buildDatabaseAdaptor() + { + DatabaseAdaptor da = new DatabaseAdaptor(); + if (USE_MARIADB) + { + da.setUsername(MARIAD_DB.getUsername()); + da.setPassword(MARIAD_DB.getPassword()); + } + da.setDriverInfo(DRIVER_CLASS, DEFAULT_CONNECTION_URL); + return da; + } + + public static Connection getConnection() + throws Exception + { + Class.forName(DRIVER_CLASS); + return USE_MARIADB ? DriverManager.getConnection(DEFAULT_CONNECTION_URL, + MARIAD_DB.getUsername(), + MARIAD_DB.getPassword()) + : DriverManager.getConnection(DEFAULT_CONNECTION_URL); + } + /** * @return a fresh JDBCSessionDataStoreFactory */ public static SessionDataStoreFactory newSessionDataStoreFactory() { - DatabaseAdaptor da = new DatabaseAdaptor(); - da.setDriverInfo(DRIVER_CLASS, DEFAULT_CONNECTION_URL); - return newSessionDataStoreFactory(da); + return newSessionDataStoreFactory(buildDatabaseAdaptor()); } public static SessionDataStoreFactory newSessionDataStoreFactory(DatabaseAdaptor da) @@ -123,8 +188,7 @@ public class JdbcTestHelper public static void prepareTables() throws SQLException { - DatabaseAdaptor da = new DatabaseAdaptor(); - da.setDriverInfo(DRIVER_CLASS, DEFAULT_CONNECTION_URL); + DatabaseAdaptor da = buildDatabaseAdaptor(); JDBCSessionDataStore.SessionTableSchema sessionTableSchema = newSessionTableSchema(); sessionTableSchema.setDatabaseAdaptor(da); @@ -163,11 +227,8 @@ public class JdbcTestHelper public static boolean existsInSessionTable(String id, boolean verbose) throws Exception { - Class.forName(DRIVER_CLASS); - Connection con = null; - try + try (Connection con = getConnection()) { - con = DriverManager.getConnection(DEFAULT_CONNECTION_URL); PreparedStatement statement = con.prepareStatement("select * from " + TABLE + " where " + ID_COL + " = ?"); @@ -186,21 +247,15 @@ public class JdbcTestHelper else return result.next(); } - finally - { - if (con != null) - con.close(); - } } @SuppressWarnings("unchecked") public static boolean checkSessionPersisted(SessionData data) throws Exception { - Class.forName(DRIVER_CLASS); PreparedStatement statement = null; ResultSet result = null; - try (Connection con = DriverManager.getConnection(DEFAULT_CONNECTION_URL);) + try (Connection con = getConnection()) { statement = con.prepareStatement("select * from " + TABLE + " where " + ID_COL + " = ? and " + CONTEXT_COL + @@ -264,9 +319,7 @@ public class JdbcTestHelper public static void insertSession(SessionData data) throws Exception { - - Class.forName(DRIVER_CLASS); - try (Connection con = DriverManager.getConnection(DEFAULT_CONNECTION_URL);) + try (Connection con = getConnection()) { PreparedStatement statement = con.prepareStatement("insert into " + TABLE + " (" + ID_COL + ", " + CONTEXT_COL + ", virtualHost, " + LAST_NODE_COL + @@ -310,8 +363,7 @@ public class JdbcTestHelper long cookieSet, long lastSaved) throws Exception { - Class.forName(DRIVER_CLASS); - try (Connection con = DriverManager.getConnection(DEFAULT_CONNECTION_URL);) + try (Connection con = getConnection()) { PreparedStatement statement = con.prepareStatement("insert into " + TABLE + " (" + ID_COL + ", " + CONTEXT_COL + ", virtualHost, " + LAST_NODE_COL + @@ -343,12 +395,9 @@ public class JdbcTestHelper public static Set getSessionIds() throws Exception { - HashSet ids = new HashSet(); - Class.forName(DRIVER_CLASS); - Connection con = null; - try + HashSet ids = new HashSet<>(); + try (Connection con = getConnection()) { - con = DriverManager.getConnection(DEFAULT_CONNECTION_URL); PreparedStatement statement = con.prepareStatement("select " + ID_COL + " from " + TABLE); ResultSet result = statement.executeQuery(); while (result.next()) @@ -357,10 +406,5 @@ public class JdbcTestHelper } return ids; } - finally - { - if (con != null) - con.close(); - } } } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java index a6755e7754f..09f8e728c8d 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java @@ -29,6 +29,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import static org.eclipse.jetty.server.session.JdbcTestHelper.USE_MARIADB; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -60,6 +61,11 @@ public class SessionTableSchemaTest return true; //test special handling for oracle } }; + if (USE_MARIADB) + { + _da.setUsername(JdbcTestHelper.MARIAD_DB.getUsername()); + _da.setPassword(JdbcTestHelper.MARIAD_DB.getPassword()); + } _da.setDriverInfo(JdbcTestHelper.DRIVER_CLASS, JdbcTestHelper.DEFAULT_CONNECTION_URL); _tableSchema = JdbcTestHelper.newSessionTableSchema(); _tableSchema.setDatabaseAdaptor(_da); @@ -84,8 +90,7 @@ public class SessionTableSchemaTest public static void insertSessionWithoutAttributes(String id, String contextPath, String vhost) throws Exception { - Class.forName(JdbcTestHelper.DRIVER_CLASS); - try (Connection con = DriverManager.getConnection(JdbcTestHelper.DEFAULT_CONNECTION_URL);) + try (Connection con = JdbcTestHelper.getConnection()) { PreparedStatement statement = con.prepareStatement("insert into " + JdbcTestHelper.TABLE + " (" + JdbcTestHelper.ID_COL + ", " + JdbcTestHelper.CONTEXT_COL + ", virtualHost, " + JdbcTestHelper.LAST_NODE_COL + @@ -119,8 +124,10 @@ public class SessionTableSchemaTest _da.initialize(); _tableSchema.prepareTables(); + String id = Long.toString(System.nanoTime()); + //insert a fake session at the root context - insertSessionWithoutAttributes("1234", "/", "0.0.0.0"); + insertSessionWithoutAttributes(id, "/", "0.0.0.0"); //test if it can be seen try (Connection con = _da.getConnection()) @@ -130,7 +137,7 @@ public class SessionTableSchemaTest handler.setContextPath("/"); SessionContext sc = new SessionContext("0", handler.getServletContext()); //test the load statement - PreparedStatement s = _tableSchema.getLoadStatement(con, "1234", sc); + PreparedStatement s = _tableSchema.getLoadStatement(con, id, sc); ResultSet rs = s.executeQuery(); assertTrue(rs.next()); } @@ -144,8 +151,10 @@ public class SessionTableSchemaTest _da.initialize(); _tableSchema.prepareTables(); + String id = Long.toString(System.nanoTime()); + //insert a fake session at the root context - insertSessionWithoutAttributes("1234", "/", "0.0.0.0"); + insertSessionWithoutAttributes(id, "/", "0.0.0.0"); //test if it can be seen try (Connection con = _da.getConnection()) @@ -154,7 +163,7 @@ public class SessionTableSchemaTest handler.setContextPath("/"); SessionContext sc = new SessionContext("0", handler.getServletContext()); PreparedStatement s = _tableSchema.getCheckSessionExistsStatement(con, sc); - s.setString(1, "1234"); + s.setString(1, id); ResultSet rs = s.executeQuery(); assertTrue(rs.next()); } @@ -168,8 +177,10 @@ public class SessionTableSchemaTest _da.initialize(); _tableSchema.prepareTables(); + String id = Long.toString(System.nanoTime()); + //insert a fake session at the root context - insertSessionWithoutAttributes("1234", "/", "0.0.0.0"); + insertSessionWithoutAttributes(id, "/", "0.0.0.0"); //test if it can be deleted try (Connection con = _da.getConnection()) @@ -177,10 +188,10 @@ public class SessionTableSchemaTest ContextHandler handler = new ContextHandler(); handler.setContextPath("/"); SessionContext sc = new SessionContext("0", handler.getServletContext()); - PreparedStatement s = _tableSchema.getDeleteStatement(con, "1234", sc); + PreparedStatement s = _tableSchema.getDeleteStatement(con, id, sc); assertEquals(1, s.executeUpdate()); - assertFalse(JdbcTestHelper.existsInSessionTable("1234", false)); + assertFalse(JdbcTestHelper.existsInSessionTable(id, false)); } } @@ -192,8 +203,10 @@ public class SessionTableSchemaTest _da.initialize(); _tableSchema.prepareTables(); + String id = Long.toString(System.nanoTime()); + //insert a fake session at the root context - insertSessionWithoutAttributes("1234", "/", "0.0.0.0"); + insertSessionWithoutAttributes(id, "/", "0.0.0.0"); try (Connection con = _da.getConnection()) { @@ -206,7 +219,7 @@ public class SessionTableSchemaTest (System.currentTimeMillis() + 100L)); ResultSet rs = s.executeQuery(); assertTrue(rs.next()); - assertEquals("1234", rs.getString(1)); + assertEquals(id, rs.getString(1)); } } @@ -218,8 +231,10 @@ public class SessionTableSchemaTest _da.initialize(); _tableSchema.prepareTables(); + String id = Long.toString(System.nanoTime()); + //insert a fake session at the root context - insertSessionWithoutAttributes("1234", "/", "0.0.0.0"); + insertSessionWithoutAttributes(id, "/", "0.0.0.0"); try (Connection con = _da.getConnection()) { @@ -231,7 +246,7 @@ public class SessionTableSchemaTest (System.currentTimeMillis() + 100L)); ResultSet rs = s.executeQuery(); assertTrue(rs.next()); - assertEquals("1234", rs.getString(1)); + assertEquals(id, rs.getString(1)); } } @@ -243,8 +258,10 @@ public class SessionTableSchemaTest _da.initialize(); _tableSchema.prepareTables(); + String id = Long.toString(System.nanoTime()); + //insert a fake session at the root context - insertSessionWithoutAttributes("1234", "/", "0.0.0.0"); + insertSessionWithoutAttributes(id, "/", "0.0.0.0"); try (Connection con = _da.getConnection()) { @@ -252,7 +269,7 @@ public class SessionTableSchemaTest handler.setContextPath("/"); SessionContext sc = new SessionContext("0", handler.getServletContext()); PreparedStatement s = _tableSchema.getUpdateStatement(con, - "1234", + id, sc); s.setString(1, "0");//should be my node id diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/resources/simplelogger.properties b/tests/test-sessions/test-jdbc-sessions/src/test/resources/simplelogger.properties new file mode 100644 index 00000000000..6f00400db97 --- /dev/null +++ b/tests/test-sessions/test-jdbc-sessions/src/test/resources/simplelogger.properties @@ -0,0 +1,3 @@ +org.slf4j.simpleLogger.defaultLogLevel=info +org.slf4j.simpleLogger.log.org.eclipse.jetty.server.session.MariaDbLogs=error +org.slf4j.simpleLogger.log.org.eclipse.jetty.server.session.JdbcTestHelper=info From 1249763aadaea73e64cfefad123ef6237000b936 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Tue, 26 May 2020 15:58:38 +1000 Subject: [PATCH 13/17] remove changes to DatabaseAdaptor with new fields username/password, use our own username/password in maria_db tests Signed-off-by: olivier lamy --- .../jetty/server/session/DatabaseAdaptor.java | 25 +------------------ .../jetty/server/session/JdbcTestHelper.java | 25 ++++++++++--------- .../session/SessionTableSchemaTest.java | 5 ---- 3 files changed, 14 insertions(+), 41 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java index 4bcf2217530..82f39cf081c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java @@ -60,8 +60,6 @@ public class DatabaseAdaptor private String _connectionUrl; private Driver _driver; private DataSource _datasource; - private String _username; - private String _password; private String _jndiName; @@ -259,26 +257,6 @@ public class DatabaseAdaptor return _connectionUrl; } - public String getUsername() - { - return _username; - } - - public void setUsername(String username) - { - this._username = username; - } - - public String getPassword() - { - return _password; - } - - public void setPassword(String password) - { - this._password = password; - } - public void initialize() throws Exception { @@ -324,8 +302,7 @@ public class DatabaseAdaptor if (_datasource != null) return _datasource.getConnection(); else - return _username == null ? DriverManager.getConnection(_connectionUrl) - : DriverManager.getConnection(_connectionUrl, _username, _password); + return DriverManager.getConnection(_connectionUrl); } /** diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java index 0affc485e3f..f4172c24c39 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java @@ -70,9 +70,10 @@ public class JdbcTestHelper public static final String COOKIE_COL = "cooktime"; public static final String CREATE_COL = "ctime"; - static MariaDBContainer MARIAD_DB = - new MariaDBContainer("mariadb:" + System.getProperty("mariadb.docker.version", "10.3.6")) - .withDatabaseName("sessions"); + static MariaDBContainer MARIAD_DB; + + static final String MARIA_DB_USER = "beer"; + static final String MARIA_DB_PASSWORD = "pacific_ale"; static { @@ -81,6 +82,11 @@ public class JdbcTestHelper try { long start = System.currentTimeMillis(); + MARIAD_DB = + new MariaDBContainer("mariadb:" + System.getProperty("mariadb.docker.version", "10.3.6")) + .withUsername(MARIA_DB_USER) + .withPassword(MARIA_DB_PASSWORD) + .withDatabaseName("sessions"); MARIAD_DB.withLogConsumer(new Slf4jLogConsumer(MARIADB_LOG)).start(); String containerIpAddress = MARIAD_DB.getContainerIpAddress(); int mariadbPort = MARIAD_DB.getMappedPort(3306); @@ -88,6 +94,9 @@ public class JdbcTestHelper DRIVER_CLASS = MARIAD_DB.getDriverClassName(); LOG.info("Mariadb container started for {}:{} - {}ms", containerIpAddress, mariadbPort, System.currentTimeMillis() - start); + DEFAULT_CONNECTION_URL = DEFAULT_CONNECTION_URL + "?user=" + MARIA_DB_USER + + "&password=" + MARIA_DB_PASSWORD; + LOG.info("DEFAULT_CONNECTION_URL: {}", DEFAULT_CONNECTION_URL); } catch (Exception e) { @@ -132,11 +141,6 @@ public class JdbcTestHelper public static DatabaseAdaptor buildDatabaseAdaptor() { DatabaseAdaptor da = new DatabaseAdaptor(); - if (USE_MARIADB) - { - da.setUsername(MARIAD_DB.getUsername()); - da.setPassword(MARIAD_DB.getPassword()); - } da.setDriverInfo(DRIVER_CLASS, DEFAULT_CONNECTION_URL); return da; } @@ -145,10 +149,7 @@ public class JdbcTestHelper throws Exception { Class.forName(DRIVER_CLASS); - return USE_MARIADB ? DriverManager.getConnection(DEFAULT_CONNECTION_URL, - MARIAD_DB.getUsername(), - MARIAD_DB.getPassword()) - : DriverManager.getConnection(DEFAULT_CONNECTION_URL); + return DriverManager.getConnection(DEFAULT_CONNECTION_URL); } /** diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java index 09f8e728c8d..4bbd29561b4 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java @@ -61,11 +61,6 @@ public class SessionTableSchemaTest return true; //test special handling for oracle } }; - if (USE_MARIADB) - { - _da.setUsername(JdbcTestHelper.MARIAD_DB.getUsername()); - _da.setPassword(JdbcTestHelper.MARIAD_DB.getPassword()); - } _da.setDriverInfo(JdbcTestHelper.DRIVER_CLASS, JdbcTestHelper.DEFAULT_CONNECTION_URL); _tableSchema = JdbcTestHelper.newSessionTableSchema(); _tableSchema.setDatabaseAdaptor(_da); From 389f46c8263464754489a8675f19f6b0d856412c Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Tue, 26 May 2020 18:32:14 +1000 Subject: [PATCH 14/17] bye bye Derby tests, only use mariadb via container Signed-off-by: olivier lamy --- .../test-sessions/test-jdbc-sessions/pom.xml | 16 +--- .../jetty/server/session/JdbcTestHelper.java | 77 +++++++------------ .../session/SessionTableSchemaTest.java | 2 - 3 files changed, 29 insertions(+), 66 deletions(-) diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 3bec9345b71..d6fe28174ab 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -26,9 +26,7 @@ org.apache.maven.plugins maven-surefire-plugin - - false - + true @@ -54,16 +52,6 @@ test-sessions-common ${project.version} - - org.apache.derby - derby - test - - - org.apache.derby - derbytools - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -112,9 +100,9 @@ org.apache.maven.plugins maven-surefire-plugin + false ${mariadb.docker.version} - true diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java index f4172c24c39..541f43c69c4 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java @@ -47,14 +47,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue; */ public class JdbcTestHelper { - public static final boolean USE_MARIADB = Boolean.getBoolean("mariadb.enabled"); - private static final Logger LOG = LoggerFactory.getLogger(JdbcTestHelper.class); private static final Logger MARIADB_LOG = LoggerFactory.getLogger("org.eclipse.jetty.server.session.MariaDbLogs"); - public static String DRIVER_CLASS = "org.apache.derby.jdbc.EmbeddedDriver"; - public static String DEFAULT_CONNECTION_URL = "jdbc:derby:memory:sessions;create=true"; - public static String DEFAULT_SHUTDOWN_URL = "jdbc:derby:memory:sessions;drop=true"; + public static String DRIVER_CLASS; + public static String DEFAULT_CONNECTION_URL; + public static final int STALE_INTERVAL = 1; public static final String EXPIRY_COL = "extime"; @@ -77,32 +75,29 @@ public class JdbcTestHelper static { - if (USE_MARIADB) + try { - try - { - long start = System.currentTimeMillis(); - MARIAD_DB = - new MariaDBContainer("mariadb:" + System.getProperty("mariadb.docker.version", "10.3.6")) - .withUsername(MARIA_DB_USER) - .withPassword(MARIA_DB_PASSWORD) - .withDatabaseName("sessions"); - MARIAD_DB.withLogConsumer(new Slf4jLogConsumer(MARIADB_LOG)).start(); - String containerIpAddress = MARIAD_DB.getContainerIpAddress(); - int mariadbPort = MARIAD_DB.getMappedPort(3306); - DEFAULT_CONNECTION_URL = MARIAD_DB.getJdbcUrl(); - DRIVER_CLASS = MARIAD_DB.getDriverClassName(); - LOG.info("Mariadb container started for {}:{} - {}ms", containerIpAddress, mariadbPort, - System.currentTimeMillis() - start); - DEFAULT_CONNECTION_URL = DEFAULT_CONNECTION_URL + "?user=" + MARIA_DB_USER + - "&password=" + MARIA_DB_PASSWORD; - LOG.info("DEFAULT_CONNECTION_URL: {}", DEFAULT_CONNECTION_URL); - } - catch (Exception e) - { - LOG.error(e.getMessage(), e); - throw new RuntimeException(e.getMessage(), e); - } + long start = System.currentTimeMillis(); + MARIAD_DB = + new MariaDBContainer("mariadb:" + System.getProperty("mariadb.docker.version", "10.3.6")) + .withUsername(MARIA_DB_USER) + .withPassword(MARIA_DB_PASSWORD) + .withDatabaseName("sessions"); + MARIAD_DB.withLogConsumer(new Slf4jLogConsumer(MARIADB_LOG)).start(); + String containerIpAddress = MARIAD_DB.getContainerIpAddress(); + int mariadbPort = MARIAD_DB.getMappedPort(3306); + DEFAULT_CONNECTION_URL = MARIAD_DB.getJdbcUrl(); + DRIVER_CLASS = MARIAD_DB.getDriverClassName(); + LOG.info("Mariadb container started for {}:{} - {}ms", containerIpAddress, mariadbPort, + System.currentTimeMillis() - start); + DEFAULT_CONNECTION_URL = DEFAULT_CONNECTION_URL + "?user=" + MARIA_DB_USER + + "&password=" + MARIA_DB_PASSWORD; + LOG.info("DEFAULT_CONNECTION_URL: {}", DEFAULT_CONNECTION_URL); + } + catch (Exception e) + { + LOG.error(e.getMessage(), e); + throw new RuntimeException(e.getMessage(), e); } } @@ -114,27 +109,9 @@ public class JdbcTestHelper public static void shutdown(String connectionUrl) throws Exception { - if (USE_MARIADB) + try (Connection connection = getConnection()) { - try (Connection connection = getConnection()) - { - connection.prepareStatement("truncate table " + TABLE).executeUpdate(); - } - return; - } - if (connectionUrl == null) - connectionUrl = DEFAULT_SHUTDOWN_URL; - - try - { - DriverManager.getConnection(connectionUrl); - } - catch (SQLException expected) - { - if (!"08006".equals(expected.getSQLState())) - { - throw expected; - } + connection.prepareStatement("truncate table " + TABLE).executeUpdate(); } } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java index 4bbd29561b4..224d93cde7d 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java @@ -20,7 +20,6 @@ package org.eclipse.jetty.server.session; import java.io.ByteArrayInputStream; import java.sql.Connection; -import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -29,7 +28,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.eclipse.jetty.server.session.JdbcTestHelper.USE_MARIADB; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; From 7cc3573ceb69e52eff272e746050201b03828eeb Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Wed, 27 May 2020 07:29:15 +1000 Subject: [PATCH 15/17] remove derby system property Signed-off-by: olivier lamy --- .../org/eclipse/jetty/server/session/JdbcTestHelper.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java index 541f43c69c4..ae951339e36 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java @@ -101,11 +101,6 @@ public class JdbcTestHelper } } - static - { - System.setProperty("derby.system.home", MavenTestingUtils.getTargetFile("test-derby").getAbsolutePath()); - } - public static void shutdown(String connectionUrl) throws Exception { From 2b1fa80b63e5e0491830c9871fc67e3d41154d3d Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Wed, 27 May 2020 07:35:32 +1000 Subject: [PATCH 16/17] always run the test except if Docker not available Signed-off-by: olivier lamy --- .../test-sessions/test-jdbc-sessions/pom.xml | 29 ++----------------- .../ClusteredInvalidationSessionTest.java | 2 ++ .../session/ClusteredOrphanedSessionTest.java | 2 ++ .../ClusteredSessionMigrationTest.java | 2 ++ .../ClusteredSessionScavengingTest.java | 2 ++ .../session/JDBCSessionDataStoreTest.java | 2 ++ .../ReloadedSessionMissingClassTest.java | 2 ++ .../session/SessionTableSchemaTest.java | 2 ++ .../session/WebAppObjectInSessionTest.java | 2 ++ 9 files changed, 19 insertions(+), 26 deletions(-) diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index d6fe28174ab..a99398a0601 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -26,7 +26,9 @@ org.apache.maven.plugins maven-surefire-plugin - true + + ${mariadb.docker.version} + @@ -85,29 +87,4 @@ test - - - remote-session-tests - - - mariadb.enabled - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - ${mariadb.docker.version} - - - - - - - diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredInvalidationSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredInvalidationSessionTest.java index 5107ed56079..a2d2d3f48ca 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredInvalidationSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredInvalidationSessionTest.java @@ -19,10 +19,12 @@ package org.eclipse.jetty.server.session; import org.junit.jupiter.api.AfterEach; +import org.testcontainers.junit.jupiter.Testcontainers; /** * ClusteredInvalidationSessionTest */ +@Testcontainers(disabledWithoutDocker = true) public class ClusteredInvalidationSessionTest extends AbstractClusteredInvalidationSessionTest { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java index 9ab354ad180..4a55fd495ff 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java @@ -19,10 +19,12 @@ package org.eclipse.jetty.server.session; import org.junit.jupiter.api.AfterEach; +import org.testcontainers.junit.jupiter.Testcontainers; /** * ClusteredOrphanedSessionTest */ +@Testcontainers(disabledWithoutDocker = true) public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessionTest { /** diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionMigrationTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionMigrationTest.java index b1ae366c8b2..2fc4ccb5c21 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionMigrationTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionMigrationTest.java @@ -31,6 +31,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import org.testcontainers.junit.jupiter.Testcontainers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -45,6 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * Rather, it tests all of the machinery above the SessionDataStore. Thus, * to reduce test time, we only apply it to the JDBCSessionDataStore. */ +@Testcontainers(disabledWithoutDocker = true) public class ClusteredSessionMigrationTest extends AbstractTestBase { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java index aaab3eac778..45542dacfaa 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java @@ -19,10 +19,12 @@ package org.eclipse.jetty.server.session; import org.junit.jupiter.api.AfterEach; +import org.testcontainers.junit.jupiter.Testcontainers; /** * ClusteredSessionScavengingTest */ +@Testcontainers(disabledWithoutDocker = true) public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest { /** diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JDBCSessionDataStoreTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JDBCSessionDataStoreTest.java index 845ddc750e7..6fa37149a8c 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JDBCSessionDataStoreTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JDBCSessionDataStoreTest.java @@ -20,10 +20,12 @@ package org.eclipse.jetty.server.session; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.testcontainers.junit.jupiter.Testcontainers; /** * JDBCSessionDataStoreTest */ +@Testcontainers(disabledWithoutDocker = true) public class JDBCSessionDataStoreTest extends AbstractSessionDataStoreTest { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java index 27f1fad3c6a..50976c1c131 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java @@ -37,6 +37,7 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.testcontainers.junit.jupiter.Testcontainers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -47,6 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * ReloadedSessionMissingClassTest */ @ExtendWith(WorkDirExtension.class) +@Testcontainers(disabledWithoutDocker = true) public class ReloadedSessionMissingClassTest { public WorkDir testdir; diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java index 224d93cde7d..2319e4e861c 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java @@ -27,6 +27,7 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.testcontainers.junit.jupiter.Testcontainers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -38,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * Test the SessionTableSchema behaviour when the database treats "" as a NULL, * like Oracle does. */ +@Testcontainers(disabledWithoutDocker = true) public class SessionTableSchemaTest { DatabaseAdaptor _da; diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java index e17e495002b..85b0525babd 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java @@ -21,10 +21,12 @@ package org.eclipse.jetty.server.session; import org.eclipse.jetty.util.resource.Resource; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import org.testcontainers.junit.jupiter.Testcontainers; /** * WebAppObjectInSessionTest */ +@Testcontainers(disabledWithoutDocker = true) public class WebAppObjectInSessionTest extends AbstractWebAppObjectInSessionTest { From e82cacfdb6ce69291c0369f22291a917248e06b0 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 27 May 2020 09:53:13 +0200 Subject: [PATCH 17/17] Jetty 9.4.x single context optimisation (#4909) * Optimisation for single context It is a frequent deployment mode to have only a single context. In that case, the ContextHandlerCollection can bypass a bit of looping/matching/selecting and just call the single context, which it works out itself anyway if the request applies to it. Signed-off-by: Greg Wilkins * Optimisation for single context updates from review Signed-off-by: Greg Wilkins --- .../handler/ContextHandlerCollection.java | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java index adc32da6368..e2e57efc8c9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java @@ -176,11 +176,23 @@ public class ContextHandlerCollection extends HandlerCollection @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - Handlers handlers = _handlers.get(); - if (handlers == null) + Mapping mapping = (Mapping)_handlers.get(); + + // Handle no contexts + if (mapping == null) + return; + Handler[] handlers = mapping.getHandlers(); + if (handlers == null || handlers.length == 0) return; - Mapping mapping = (Mapping)handlers; + // handle only a single context. + if (handlers.length == 1) + { + handlers[0].handle(target, baseRequest, request, response); + return; + } + + // handle async dispatch to specific context HttpChannelState async = baseRequest.getHttpChannelState(); if (async.isAsync()) { @@ -197,6 +209,7 @@ public class ContextHandlerCollection extends HandlerCollection } } + // handle many contexts if (target.startsWith("/")) { Trie> pathBranches = mapping._pathBranches; @@ -229,11 +242,9 @@ public class ContextHandlerCollection extends HandlerCollection } else { - if (mapping.getHandlers() == null) - return; - for (int i = 0; i < mapping.getHandlers().length; i++) + for (Handler handler : handlers) { - mapping.getHandlers()[i].handle(target, baseRequest, request, response); + handler.handle(target, baseRequest, request, response); if (baseRequest.isHandled()) return; }