From 1184dc273da14f75df9b818a7a9946a25b599b2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 09:20:36 +0000 Subject: [PATCH 01/39] Bump google-cloud-datastore from 2.2.3 to 2.2.4 Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.2.3 to 2.2.4. - [Release notes](https://github.com/googleapis/java-datastore/releases) - [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/java-datastore/compare/v2.2.3...v2.2.4) --- updated-dependencies: - dependency-name: com.google.cloud:google-cloud-datastore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- jetty-gcloud/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 85c62114200..83cbb7fab8d 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -13,7 +13,7 @@ Jetty :: GCloud - 2.2.3 + 2.2.4 From bf53b23ef0872c3077108fc09b492fe19ac0109d Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Fri, 4 Feb 2022 13:58:19 +0100 Subject: [PATCH 02/39] #7529 upgrade quiche native lib to version 0.11.0b to work on less recent linux libc (#7534) #7529 upgrade quiche native lib to version 0.11.0.1 to work on less recent linux libc Signed-off-by: Ludovic Orban --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1c4369dbfa..1d59dab52ba 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 3.1.0.Final 1.1 1.0.7 - 0.11.0 + 0.11.0.1 4.0.6 1.2 5.9 From 35b76de25c12182126cece91c5df8c113590e0c7 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 7 Feb 2022 11:23:41 +0100 Subject: [PATCH 03/39] Updated Jetty Quiche Native to 0.11.0.2. Signed-off-by: Simone Bordet --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d59dab52ba..c48c10248a1 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 3.1.0.Final 1.1 1.0.7 - 0.11.0.1 + 0.11.0.2 4.0.6 1.2 5.9 From 716c7afd8e40d8f645b32aff06945a249d6eb511 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 7 Feb 2022 11:34:12 +0100 Subject: [PATCH 04/39] Updating to version 10.0.8 --- VERSION.txt | 71 +++++++- apache-jsp/pom.xml | 2 +- apache-jstl/pom.xml | 2 +- build-resources/pom.xml | 2 +- .../demo-async-rest-jar/pom.xml | 2 +- .../demo-async-rest-server/pom.xml | 2 +- .../demo-async-rest-webapp/pom.xml | 2 +- demos/demo-async-rest/pom.xml | 2 +- demos/demo-jaas-webapp/pom.xml | 2 +- demos/demo-jetty-webapp/pom.xml | 2 +- demos/demo-jndi-webapp/pom.xml | 2 +- demos/demo-jsp-webapp/pom.xml | 2 +- demos/demo-mock-resources/pom.xml | 2 +- demos/demo-proxy-webapp/pom.xml | 2 +- demos/demo-simple-webapp/pom.xml | 2 +- .../demo-container-initializer/pom.xml | 2 +- demos/demo-spec/demo-spec-webapp/pom.xml | 2 +- demos/demo-spec/demo-web-fragment/pom.xml | 2 +- demos/demo-spec/pom.xml | 2 +- demos/embedded/pom.xml | 2 +- demos/pom.xml | 2 +- .../jetty-asciidoctor-extensions/pom.xml | 2 +- documentation/jetty-documentation/pom.xml | 2 +- documentation/pom.xml | 2 +- javadoc/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-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 170 +++++++++--------- jetty-cdi/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-deploy/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-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-http3/http3-client/pom.xml | 2 +- jetty-http3/http3-common/pom.xml | 2 +- .../http3-http-client-transport/pom.xml | 2 +- jetty-http3/http3-qpack/pom.xml | 2 +- jetty-http3/http3-server/pom.xml | 2 +- jetty-http3/http3-tests/pom.xml | 2 +- jetty-http3/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-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-keystore/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 +- .../test-jetty-osgi-webapp-resources/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-p2/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quic/pom.xml | 2 +- jetty-quic/quic-client/pom.xml | 2 +- jetty-quic/quic-common/pom.xml | 2 +- jetty-quic/quic-quiche/pom.xml | 2 +- .../quic-quiche/quic-quiche-common/pom.xml | 2 +- .../quic-quiche-foreign-incubator/pom.xml | 2 +- .../quic-quiche/quic-quiche-jna/pom.xml | 2 +- jetty-quic/quic-server/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-slf4j-impl/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-unixdomain-server/pom.xml | 2 +- .../jetty-unixsocket-client/pom.xml | 2 +- .../jetty-unixsocket-common/pom.xml | 2 +- .../jetty-unixsocket-server/pom.xml | 2 +- jetty-unixsocket/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-websocket/websocket-core-client/pom.xml | 2 +- jetty-websocket/websocket-core-common/pom.xml | 2 +- jetty-websocket/websocket-core-server/pom.xml | 2 +- jetty-websocket/websocket-core-tests/pom.xml | 2 +- .../websocket-javax-client/pom.xml | 2 +- .../websocket-javax-common/pom.xml | 2 +- .../websocket-javax-server/pom.xml | 2 +- jetty-websocket/websocket-javax-tests/pom.xml | 2 +- jetty-websocket/websocket-jetty-api/pom.xml | 2 +- .../websocket-jetty-client/pom.xml | 2 +- .../websocket-jetty-common/pom.xml | 2 +- .../websocket-jetty-server/pom.xml | 2 +- jetty-websocket/websocket-jetty-tests/pom.xml | 2 +- jetty-websocket/websocket-servlet/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- tests/jetty-http-tools/pom.xml | 2 +- tests/jetty-jmh/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-cdi/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-jpms/pom.xml | 2 +- .../test-jpms-websocket-core/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-bad-websocket-webapp/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 +- .../test-webapps/test-owb-cdi-webapp/pom.xml | 2 +- .../test-simple-session-webapp/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../test-websocket-client-webapp/pom.xml | 2 +- .../test-websocket-webapp/pom.xml | 2 +- .../test-webapps/test-weld-cdi-webapp/pom.xml | 2 +- tests/test-websocket-autobahn/pom.xml | 2 +- 171 files changed, 320 insertions(+), 259 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 374bb9eaa8e..dddd4a7bb56 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,65 @@ -jetty-10.0.8-SNAPSHOT +jetty-10.0.8 - 07 February 2022 + + 2504 Expose more WebSocket details in JMX and Server Dump + + 4275 Path Normalization/Traversal - Context Matching + + 4317 EventSource does not work with GzipHandler + + 6017 Property overriding does not work + + 6282 SecuredRedirectHandler should probably redirect with 301 + + 6497 Replace SameFileAliasChecker + + 6728 QUIC and HTTP/3 + + 6730 HTTP3: update Quiche to 0.9.0 + + 6965 Expose Spec `ServerContainer.upgrade()` API + + 6973 Jetty starts consuming CPU that remains high even without any traffic + + 6974 Major websocket memory change in 9.4.36 + + 6980 ELContextCleaner failed because cannot access a member of class + javax.el.BeanELResolver with modifiers "private static final" + + 6987 jetty-unixdomain-server is missing from jetty-bom + + 6990 UnixDomainServerConnector throws misleading exception on invalid socket + path + + 7008 Problem with jetty.sh start regression 10.0.6 -> 10.0.7 when using + JETTY_USER + + 7012 Remove all old geronimo spec jars from jetty-10 + + 7031 ResponseWriter.println(char) does not print newline + + 7042 Simplify configuration to use different OpenIdConfiguration per webapp. + + 7059 NPE in AllowedResourceAliasChecker.getPath() + + 7063 Simplify command line use of org.eclipse.jetty.util.Password + + 7064 Cleanup or clarify `(null)` in output of `--list-config` + + 7086 WebSocket: java.lang.IllegalStateException: already released + RetainableByteBuffer + + 7103 Rework LaF of distro landing page + + 7107 Client timeout and async close exceptions when setting max duration on + pool + + 7109 Deprecate UnixSocket JNR support + + 7111 Add support to deprecate jetty-home modules + + 7113 Improve Unix-Domain client documentation + + 7124 Add default methods on LifeCycle.Listener interface + + 7131 Use Charset instead of encoding string where possible + + 7157 Multiplexed connection pools retain CLOSED entries + + 7160 HttpURI considers %25 to be ambiguous, preventing access to static + resources with % in their name + + 7240 Clarify and javadoc InvocationType + + 7243 Reset pooled ByteBuffer endianness + + 7262 Allow the SerlvetHandler.getFilterChain method to be overridden. + + 7277 Allow override of `ServletRequest.getLocalName()` and `.getLocalPort()` + in post-intermediary scenarios + + 7280 Interceptors don't get destroyed in HttpInput + + 7281 EOFs are not passed to interceptors any more - shouldn't they? + + 7284 HttpInput reopen/recycle cleanup + + 7297 Deprecate log4j 1.x support + + 7313 addBean(_attributes); only called in the Convenience constructor of + org.eclipse.jetty.server.Server + + 7327 jetty-slf4j-impl missing from BOM + + 7348 Slow CONNECT request causes NPE + + 7351 Large WebSocket payloads with permessage-deflate hang on 10.0.7 + + 7354 Demo jars should not be in jetty-home + + 7369 Document CustomRequestLog + + 7375 Some environments require Request scoping during session save + + 7435 Investigate Infinispan transitive dependencies + + 7496 Transient 400: Bad Request responses in jetty-9.4.45.v20220128 + + 7514 Adding InheritedListeners to already-started components can cause + IllegalStateException + + 7523 Typo in AnnotationConfiguration + + 7524 Missing package in JmxConfiguration + + 7529 Upgrade quiche to version 0.11.0 jetty-10.0.7 - 06 October 2021 + 3514 Use interpolation of versions from pom in mod files @@ -13,15 +74,15 @@ jetty-10.0.7 - 06 October 2021 active modules + 6487 Expose ServletHolder getter in ServletHandler$ChainEnd for auditing libraries to use - + 6489 Some URI valid compliance modes cannot be set in .ini file. + + 6489 Some URI valid compliance modes cannot be set in .ini file + 6491 onDataAvailable() not called when HttpParser is closed prematurely + 6497 Replace SameFileAliasChecker - + 6520 Error page has HTML error when writePoweredBy is enabled. + + 6520 Error page has HTML error when writePoweredBy is enabled + 6544 Using jetty.gzip.excludedMimeTypeList property results in an error + 6545 image/webp MIME type support + 6552 FileBufferedInterceptor.dispose not working due to locked file + 6553 Review usage of Authentication.UNAUTHENTICATED in SecurityHandler - + 6554 Allow creation of DefaultIdentityService without realmName. + + 6554 Allow creation of DefaultIdentityService without realmName + 6556 MemcachedSessionDataMap needs to set the context classloader before serialization/deseriazliation. + 6558 Allow to configure return type in JSON array parsing @@ -36,7 +97,7 @@ jetty-10.0.7 - 06 October 2021 + 6617 Add basic auth support for OpenId token endpoint (client_secret_basic) + 6618 ID token `azp` claim should not be required if `aud` is single value array - + 6642 WebSocket handling of Connection: upgrade,close. + + 6642 WebSocket handling of Connection: upgrade,close + 6646 Deadlock in HTTP2Flusher when using a small thread pool due to incorrect InvocableType + 6652 Improve ReservedThreadExecutor dump diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index b28a7397a06..431f26668b7 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index d7f976fecd4..97c4000de2f 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 apache-jstl diff --git a/build-resources/pom.xml b/build-resources/pom.xml index ee419eb4788..326af32f70a 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -7,7 +7,7 @@ --> org.eclipse.jetty build-resources - 10.0.8-SNAPSHOT + 10.0.8 Jetty :: Build Resources jar diff --git a/demos/demo-async-rest/demo-async-rest-jar/pom.xml b/demos/demo-async-rest/demo-async-rest-jar/pom.xml index d80ff252d5d..5cbbd9e19e7 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-server/pom.xml b/demos/demo-async-rest/demo-async-rest-server/pom.xml index 41c0337e2ce..3b9672cd4be 100644 --- a/demos/demo-async-rest/demo-async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml index a3945be9e28..1d95e9d8dbe 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/demos/demo-async-rest/pom.xml b/demos/demo-async-rest/pom.xml index 598d319e075..683a31efcbe 100644 --- a/demos/demo-async-rest/pom.xml +++ b/demos/demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/demos/demo-jaas-webapp/pom.xml b/demos/demo-jaas-webapp/pom.xml index 38fb6e50bb1..f1f0746c75b 100644 --- a/demos/demo-jaas-webapp/pom.xml +++ b/demos/demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 demo-jaas-webapp Demo :: JAAS :: WebApp diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index c8d034ab3e1..7732b7d2661 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 ../pom.xml 4.0.0 diff --git a/demos/demo-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml index 2da4ee5a07f..ee76ec2bda1 100644 --- a/demos/demo-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 demo-jndi-webapp Demo :: JNDI :: WebApp diff --git a/demos/demo-jsp-webapp/pom.xml b/demos/demo-jsp-webapp/pom.xml index 0f85989f74a..3a892ed0bbc 100644 --- a/demos/demo-jsp-webapp/pom.xml +++ b/demos/demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/demos/demo-mock-resources/pom.xml b/demos/demo-mock-resources/pom.xml index 83d091f7355..22674123ba5 100644 --- a/demos/demo-mock-resources/pom.xml +++ b/demos/demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 Demo :: Mock Resources demo-mock-resources diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index 9d354c90e5d..6973c2594a9 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 demo-proxy-webapp diff --git a/demos/demo-simple-webapp/pom.xml b/demos/demo-simple-webapp/pom.xml index 33e8188695f..822e20e2da9 100644 --- a/demos/demo-simple-webapp/pom.xml +++ b/demos/demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/demos/demo-spec/demo-container-initializer/pom.xml b/demos/demo-spec/demo-container-initializer/pom.xml index 892a453443e..9aea9f22b40 100644 --- a/demos/demo-spec/demo-container-initializer/pom.xml +++ b/demos/demo-spec/demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 ../../pom.xml demo-container-initializer diff --git a/demos/demo-spec/demo-spec-webapp/pom.xml b/demos/demo-spec/demo-spec-webapp/pom.xml index 20926635bb3..cc3e5273501 100644 --- a/demos/demo-spec/demo-spec-webapp/pom.xml +++ b/demos/demo-spec/demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 ../../pom.xml Demo :: Servlet Spec :: Webapp diff --git a/demos/demo-spec/demo-web-fragment/pom.xml b/demos/demo-spec/demo-web-fragment/pom.xml index fe00b8011b3..95ddaf77858 100644 --- a/demos/demo-spec/demo-web-fragment/pom.xml +++ b/demos/demo-spec/demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 ../../pom.xml diff --git a/demos/demo-spec/pom.xml b/demos/demo-spec/pom.xml index dd8f379e6ff..a6f806e69a9 100644 --- a/demos/demo-spec/pom.xml +++ b/demos/demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 Demo :: Servlet Spec demo-spec diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml index b46e4225f7d..9b373788c13 100644 --- a/demos/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 demos-jetty-embedded diff --git a/demos/pom.xml b/demos/pom.xml index 92fdf883c38..12b0396888e 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 5c1418d8191..3c1014e61e7 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 517a3244587..80748f96bec 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/documentation/pom.xml b/documentation/pom.xml index 0064e59d141..409fc3fbfc1 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/javadoc/pom.xml b/javadoc/pom.xml index d5bf9cd98c4..1d61f5dd738 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index fe6dc278c2c..3453c5bd813 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 - 10.0.8-SNAPSHOT + 10.0.8 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 f13171752ad..030350a0737 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index 4ccb67f7b79..e2c6ce9fa53 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 85a7feb0435..f67a03f161d 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 572e415cbf0..1f8d7f6ea62 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 5c5abf9c711..4c6a74f5926 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index b12c7092600..3db59329a00 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 3d10ae35284..7e8d2ccfa67 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 07609e6c5b0..3021f043227 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index e6070bcff29..cc3236c0e19 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 jetty-bom @@ -53,419 +53,419 @@ org.eclipse.jetty apache-jsp - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty apache-jstl - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-alpn-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-alpn-java-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-alpn-java-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-alpn-conscrypt-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-alpn-conscrypt-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-alpn-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-annotations - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-ant - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-cdi - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-deploy - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.fcgi fcgi-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.fcgi fcgi-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-home - 10.0.8-SNAPSHOT + 10.0.8 zip org.eclipse.jetty jetty-home - 10.0.8-SNAPSHOT + 10.0.8 tar.gz org.eclipse.jetty jetty-http - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http2 http2-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http2 http2-common - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http2 http2-hpack - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http2 http2-http-client-transport - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http2 http2-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http3 http3-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http3 http3-common - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http3 http3-http-client-transport - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http3 http3-qpack - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.http3 http3-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-http-spi - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty infinispan-common - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty infinispan-remote - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty infinispan-remote-query - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty infinispan-embedded - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty infinispan-embedded-query - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-hazelcast - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-io - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-jaas - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-jaspi - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-jmx - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-jndi - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-keystore - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.memcached jetty-memcached-sessions - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-nosql - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.osgi jetty-osgi-alpn - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.osgi jetty-osgi-boot - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.quic quic-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.quic quic-common - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.quic quic-quiche-common - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.quic quic-quiche-jna - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.quic quic-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.osgi jetty-httpservice - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-plus - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-proxy - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-quickstart - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-rewrite - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-security - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-openid - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-servlet - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-servlets - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-slf4j-impl - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-unixdomain-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-unixsocket-common - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-unixsocket-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-unixsocket-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-util - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-util-ajax - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-webapp - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-javax-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-javax-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-javax-common - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-jetty-api - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-jetty-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-jetty-common - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-jetty-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-servlet - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-core-common - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-core-client - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty.websocket websocket-core-server - 10.0.8-SNAPSHOT + 10.0.8 org.eclipse.jetty jetty-xml - 10.0.8-SNAPSHOT + 10.0.8 @@ -481,7 +481,7 @@ org.eclipse.jetty.quic quic-quiche-foreign-incubator - 10.0.8-SNAPSHOT + 10.0.8 diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 531bd7f3855..1512acea641 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 92ff6c83523..56fee66ae60 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 72c0b5046d7..6f00890f949 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index b4d772347a1..eac817a964b 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index e7ed95a8a09..acea812d7db 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index 955fd491afa..779cf145442 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 2a304d6b045..d0d8f05f381 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 85c62114200..82e769e0c88 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index a95376509d0..f3479477e4c 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 32833fe6bc7..9718f3d88b4 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 446e7b8787e..7729a22f29e 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index d1a9c8cf755..70405a3afb0 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 0c2b4cb1498..bb09fabfb77 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 51e9f69867c..c5a6887005d 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 61d7303959b..835cb91c7c1 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index ed707c6861a..484104998b9 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 4fe289cd675..d00ba89ac85 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index b623a51902f..c8db34ed275 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http3/http3-client/pom.xml b/jetty-http3/http3-client/pom.xml index e7d887667aa..3eedc370308 100644 --- a/jetty-http3/http3-client/pom.xml +++ b/jetty-http3/http3-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http3/http3-common/pom.xml b/jetty-http3/http3-common/pom.xml index 606403852b3..a7f0ac766ae 100644 --- a/jetty-http3/http3-common/pom.xml +++ b/jetty-http3/http3-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http3/http3-http-client-transport/pom.xml b/jetty-http3/http3-http-client-transport/pom.xml index b5c19f0db03..f35a402e91f 100644 --- a/jetty-http3/http3-http-client-transport/pom.xml +++ b/jetty-http3/http3-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http3/http3-qpack/pom.xml b/jetty-http3/http3-qpack/pom.xml index 42a7640acc9..41879556c1c 100644 --- a/jetty-http3/http3-qpack/pom.xml +++ b/jetty-http3/http3-qpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http3/http3-server/pom.xml b/jetty-http3/http3-server/pom.xml index 377242bb87f..4b310f8a5a8 100644 --- a/jetty-http3/http3-server/pom.xml +++ b/jetty-http3/http3-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http3/http3-tests/pom.xml b/jetty-http3/http3-tests/pom.xml index 03b9161de77..b0db9d7c8ac 100644 --- a/jetty-http3/http3-tests/pom.xml +++ b/jetty-http3/http3-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-http3/pom.xml b/jetty-http3/pom.xml index a7a16502f16..ec862ba4f6c 100644 --- a/jetty-http3/pom.xml +++ b/jetty-http3/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index fd86989580c..5903d928cb1 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 infinispan-common diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index ad0608f101a..446ce6484e8 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index 5bbd17801a1..e6d98e0e453 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 infinispan-embedded diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index a10bfa106c4..cee76e86367 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index 154189501ac..5a72519e516 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 2d6361ecd1e..9ee98b2f44c 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index cdfba4c6192..9a7fbe9fe40 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 5bc0cb9030b..8eb3fb8b334 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index b8f667348e1..3e196834512 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index ccb8c8f6730..4d804707022 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index adc2ed78e60..7df0e02c011 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 3c9209ea6a2..8d2da7aeefc 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml index 83b80273109..1b8b21831ab 100644 --- a/jetty-keystore/pom.xml +++ b/jetty-keystore/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-keystore diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index ca9517f727f..318c72e1fc1 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 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 2121e98b4ec..204b67c8de0 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index 7a20034f762..40bc94034b5 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 2d54782baa9..23a27588bb6 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index cd59df85630..00e8707ac68 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 6ee644b14f9..ee2a53cf1f8 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 - 10.0.8-SNAPSHOT + 10.0.8 diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 2926a898a97..4da7eb78ea1 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 - 10.0.8-SNAPSHOT + 10.0.8 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 026a9731fd7..f892a3ba205 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 - 10.0.8-SNAPSHOT + 10.0.8 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 70904099d63..29fea770566 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 - 10.0.8-SNAPSHOT + 10.0.8 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 26da5a3b29a..90116db362b 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 460b5eaf794..29e0c124782 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 2debb079f7a..731a6bbde9b 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 - 10.0.8-SNAPSHOT + 10.0.8 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 064e392b307..46928408a73 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 - 10.0.8-SNAPSHOT + 10.0.8 ../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 b0ec0cf22b6..8f7f11a7231 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 test-jetty-osgi-server diff --git a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml index 35156236533..f5217877bab 100644 --- a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 test-jetty-osgi-webapp-resources diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index 8a610fc767a..237e2e62dfc 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 - 10.0.8-SNAPSHOT + 10.0.8 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 7f5ee29d108..086fceb6dfb 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 - 10.0.8-SNAPSHOT + 10.0.8 ../pom.xml 4.0.0 diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index 38ed979d8f1..b9eb977b68c 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-p2 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 02b706c7a4b..98ac9f79ac2 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 085567512af..c1d9abf91cc 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-quic/pom.xml b/jetty-quic/pom.xml index 31abeda10fc..3ace03fc875 100644 --- a/jetty-quic/pom.xml +++ b/jetty-quic/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-quic/quic-client/pom.xml b/jetty-quic/quic-client/pom.xml index 9a998e5c38c..11fde0859fd 100644 --- a/jetty-quic/quic-client/pom.xml +++ b/jetty-quic/quic-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-quic/quic-common/pom.xml b/jetty-quic/quic-common/pom.xml index 837b06be343..b90e6933d96 100644 --- a/jetty-quic/quic-common/pom.xml +++ b/jetty-quic/quic-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-quic/quic-quiche/pom.xml b/jetty-quic/quic-quiche/pom.xml index c420d9861c3..8f9bbfbdaec 100644 --- a/jetty-quic/quic-quiche/pom.xml +++ b/jetty-quic/quic-quiche/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml index 30f6062b007..b2ba278b5a0 100644 --- a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml index 915b9a0ee8e..91eccefa9ee 100644 --- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml index 3dc909d32fd..2e4dca8d38d 100644 --- a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml index 4b54ffb12c2..0a42a3607e7 100644 --- a/jetty-quic/quic-server/pom.xml +++ b/jetty-quic/quic-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index fbd74148c5e..933116a5b80 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index c22ecf41a1d..3a163eb8561 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 4dadd7610ba..1159cb61cf7 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 3374447727c..af91c3f9d23 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index a38a18c582a..5c6fb6f0860 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 286ee670e7c..9ec5bdf3fb5 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 5f7f2b51338..dbbe31e3237 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-slf4j-impl/pom.xml b/jetty-slf4j-impl/pom.xml index 817aa241bed..1a2c89fa810 100644 --- a/jetty-slf4j-impl/pom.xml +++ b/jetty-slf4j-impl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 211b1f62cc4..da03710814e 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-start diff --git a/jetty-unixdomain-server/pom.xml b/jetty-unixdomain-server/pom.xml index 1f2cff586e8..680f78d33d2 100644 --- a/jetty-unixdomain-server/pom.xml +++ b/jetty-unixdomain-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index d3e077273fd..68671e90ef7 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 4daf951db48..46e15be199c 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-unixsocket - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index 5432ec840bb..5ceb4d59fd6 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 5892c440c3f..4f8e4128db5 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 6aa67c77f35..1e3a381b989 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 27ec017b922..eee59dd951a 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 94dd025e50c..07d8c80d66e 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index effc75e6609..b69332a789e 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml index f2b81390146..736c7e4126d 100644 --- a/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-websocket/websocket-core-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml index 207f8d62f7d..4ae6e028be4 100644 --- a/jetty-websocket/websocket-core-common/pom.xml +++ b/jetty-websocket/websocket-core-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml index 9437b3e90f9..4be3a9f2fb3 100644 --- a/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-websocket/websocket-core-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index 50d54917b6f..6062ef2a6ef 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml index ad14f94f7ce..083feffbfc2 100644 --- a/jetty-websocket/websocket-javax-client/pom.xml +++ b/jetty-websocket/websocket-javax-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index 54b7261d4a5..723064321c5 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index 21c8845d025..305ad77cae8 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 181b8b4914a..d990d290f5a 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-jetty-api/pom.xml b/jetty-websocket/websocket-jetty-api/pom.xml index e7f23213186..abe555427c2 100644 --- a/jetty-websocket/websocket-jetty-api/pom.xml +++ b/jetty-websocket/websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index f3695d4ed54..02b091ec632 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index f196ba3f4f1..cce1e4b6be3 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index afe1edd83c7..340e0dea503 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index f0d76c6b908..bb8fc2db0a8 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 264a95adc51..732a1d3b049 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 9f134cc55fe..923bf4c4f11 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index c48c10248a1..770ecdf9f0c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/jetty-http-tools/pom.xml b/tests/jetty-http-tools/pom.xml index d5235acbc62..6e206d8df17 100644 --- a/tests/jetty-http-tools/pom.xml +++ b/tests/jetty-http-tools/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index e418878d0cb..420d2a73927 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index 8d397c72195..07cc0ec61d3 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.8-SNAPSHOT + 10.0.8 ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index e21cbef4a7b..0c793b2805d 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 1c866241043..f84b97fdec0 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 80bde581a49..bf5c9825d5b 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index bf1a8cd1f17..825f5bf8245 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 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 6622c9232df..4cf4e0db1ac 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 - 10.0.8-SNAPSHOT + 10.0.8 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 a5be89751b9..d255c8834a7 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 - 10.0.8-SNAPSHOT + 10.0.8 jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index db90bd7a3d5..d5f52182888 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 test-jmx-parent diff --git a/tests/test-jpms/pom.xml b/tests/test-jpms/pom.xml index fa6143a9fbf..48a80d5bd66 100644 --- a/tests/test-jpms/pom.xml +++ b/tests/test-jpms/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 test-jpms diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index 0b159badf68..b0bfc6cdd73 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -3,7 +3,7 @@ test-jpms org.eclipse.jetty.tests - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 test-jpms-websocket-core diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 0031a1bd495..4262f652dc5 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index d4a5b82376b..5fc26816eb1 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 095c675d13a..13a82cf1fc7 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 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 294a7d03445..84563b425ed 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 - 10.0.8-SNAPSHOT + 10.0.8 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 e1e060192ae..5816926a8ef 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 - 10.0.8-SNAPSHOT + 10.0.8 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 9e792363940..1d488250635 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 - 10.0.8-SNAPSHOT + 10.0.8 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 d673432c066..21792d9c923 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 - 10.0.8-SNAPSHOT + 10.0.8 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 a43834199f9..03e50e73034 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 - 10.0.8-SNAPSHOT + 10.0.8 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 e19ca490d1f..9b204b05acf 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 - 10.0.8-SNAPSHOT + 10.0.8 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 576e8c77522..148f5ad84b1 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 - 10.0.8-SNAPSHOT + 10.0.8 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 63263b0ed04..49a13904546 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 - 10.0.8-SNAPSHOT + 10.0.8 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 42ebd00ddf1..93f0248b654 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index c092e9a3755..3a610756bf4 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index 84bfe7b08dd..ac58d6166c5 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index 75cc700dcae..fa227272bc3 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 48edc008a06..ef850dde954 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 88418fa625d..33a1b53eb97 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-webapps/test-simple-session-webapp/pom.xml b/tests/test-webapps/test-simple-session-webapp/pom.xml index 06cc46ba11e..e5b2311af94 100644 --- a/tests/test-webapps/test-simple-session-webapp/pom.xml +++ b/tests/test-webapps/test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8-SNAPSHOT + 10.0.8 test-simple-session-webapp diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index cc04801451b..295b4e6a420 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 - 10.0.8-SNAPSHOT + 10.0.8 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml index be20a44a7da..620be6da0b9 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-webapps/test-websocket-client-webapp/pom.xml b/tests/test-webapps/test-websocket-client-webapp/pom.xml index aae875c5491..67e79034643 100644 --- a/tests/test-webapps/test-websocket-client-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index ffd7a8083b3..cff37984db0 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index 8ca6dcd2535..a3c54acc73d 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 - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 diff --git a/tests/test-websocket-autobahn/pom.xml b/tests/test-websocket-autobahn/pom.xml index f3371e86c9c..23836e66b3b 100644 --- a/tests/test-websocket-autobahn/pom.xml +++ b/tests/test-websocket-autobahn/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8-SNAPSHOT + 10.0.8 4.0.0 From a4fda96f492eb39edd6cb8c0e95296c3fcadf826 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 7 Feb 2022 12:02:02 +0100 Subject: [PATCH 05/39] Updating to version 10.0.9-SNAPSHOT --- VERSION.txt | 2 + apache-jsp/pom.xml | 2 +- apache-jstl/pom.xml | 2 +- build-resources/pom.xml | 2 +- .../demo-async-rest-jar/pom.xml | 2 +- .../demo-async-rest-server/pom.xml | 2 +- .../demo-async-rest-webapp/pom.xml | 2 +- demos/demo-async-rest/pom.xml | 2 +- demos/demo-jaas-webapp/pom.xml | 2 +- demos/demo-jetty-webapp/pom.xml | 2 +- demos/demo-jndi-webapp/pom.xml | 2 +- demos/demo-jsp-webapp/pom.xml | 2 +- demos/demo-mock-resources/pom.xml | 2 +- demos/demo-proxy-webapp/pom.xml | 2 +- demos/demo-simple-webapp/pom.xml | 2 +- .../demo-container-initializer/pom.xml | 2 +- demos/demo-spec/demo-spec-webapp/pom.xml | 2 +- demos/demo-spec/demo-web-fragment/pom.xml | 2 +- demos/demo-spec/pom.xml | 2 +- demos/embedded/pom.xml | 2 +- demos/pom.xml | 2 +- .../jetty-asciidoctor-extensions/pom.xml | 2 +- documentation/jetty-documentation/pom.xml | 2 +- documentation/pom.xml | 2 +- javadoc/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-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 170 +++++++++--------- jetty-cdi/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-deploy/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-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-http3/http3-client/pom.xml | 2 +- jetty-http3/http3-common/pom.xml | 2 +- .../http3-http-client-transport/pom.xml | 2 +- jetty-http3/http3-qpack/pom.xml | 2 +- jetty-http3/http3-server/pom.xml | 2 +- jetty-http3/http3-tests/pom.xml | 2 +- jetty-http3/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-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-keystore/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 +- .../test-jetty-osgi-webapp-resources/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-p2/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quic/pom.xml | 2 +- jetty-quic/quic-client/pom.xml | 2 +- jetty-quic/quic-common/pom.xml | 2 +- jetty-quic/quic-quiche/pom.xml | 2 +- .../quic-quiche/quic-quiche-common/pom.xml | 2 +- .../quic-quiche-foreign-incubator/pom.xml | 2 +- .../quic-quiche/quic-quiche-jna/pom.xml | 2 +- jetty-quic/quic-server/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-slf4j-impl/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-unixdomain-server/pom.xml | 2 +- .../jetty-unixsocket-client/pom.xml | 2 +- .../jetty-unixsocket-common/pom.xml | 2 +- .../jetty-unixsocket-server/pom.xml | 2 +- jetty-unixsocket/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-websocket/websocket-core-client/pom.xml | 2 +- jetty-websocket/websocket-core-common/pom.xml | 2 +- jetty-websocket/websocket-core-server/pom.xml | 2 +- jetty-websocket/websocket-core-tests/pom.xml | 2 +- .../websocket-javax-client/pom.xml | 2 +- .../websocket-javax-common/pom.xml | 2 +- .../websocket-javax-server/pom.xml | 2 +- jetty-websocket/websocket-javax-tests/pom.xml | 2 +- jetty-websocket/websocket-jetty-api/pom.xml | 2 +- .../websocket-jetty-client/pom.xml | 2 +- .../websocket-jetty-common/pom.xml | 2 +- .../websocket-jetty-server/pom.xml | 2 +- jetty-websocket/websocket-jetty-tests/pom.xml | 2 +- jetty-websocket/websocket-servlet/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- tests/jetty-http-tools/pom.xml | 2 +- tests/jetty-jmh/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-cdi/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-jpms/pom.xml | 2 +- .../test-jpms-websocket-core/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-bad-websocket-webapp/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 +- .../test-webapps/test-owb-cdi-webapp/pom.xml | 2 +- .../test-simple-session-webapp/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- .../pom.xml | 2 +- .../test-websocket-client-webapp/pom.xml | 2 +- .../test-websocket-webapp/pom.xml | 2 +- .../test-webapps/test-weld-cdi-webapp/pom.xml | 2 +- tests/test-websocket-autobahn/pom.xml | 2 +- 171 files changed, 256 insertions(+), 254 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index dddd4a7bb56..4de3ddf3159 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-10.0.9-SNAPSHOT + jetty-10.0.8 - 07 February 2022 + 2504 Expose more WebSocket details in JMX and Server Dump + 4275 Path Normalization/Traversal - Context Matching diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 431f26668b7..5f48eb85315 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index 97c4000de2f..59672a49ebf 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 apache-jstl diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 326af32f70a..4264abba890 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -7,7 +7,7 @@ --> org.eclipse.jetty build-resources - 10.0.8 + 10.0.9-SNAPSHOT Jetty :: Build Resources jar diff --git a/demos/demo-async-rest/demo-async-rest-jar/pom.xml b/demos/demo-async-rest/demo-async-rest-jar/pom.xml index 5cbbd9e19e7..158b57a5648 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-server/pom.xml b/demos/demo-async-rest/demo-async-rest-server/pom.xml index 3b9672cd4be..36fd6f6cd02 100644 --- a/demos/demo-async-rest/demo-async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml index 1d95e9d8dbe..d9383a05c2f 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demo-async-rest-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/demos/demo-async-rest/pom.xml b/demos/demo-async-rest/pom.xml index 683a31efcbe..ddb3c0aaba0 100644 --- a/demos/demo-async-rest/pom.xml +++ b/demos/demo-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/demos/demo-jaas-webapp/pom.xml b/demos/demo-jaas-webapp/pom.xml index f1f0746c75b..166cbe349d0 100644 --- a/demos/demo-jaas-webapp/pom.xml +++ b/demos/demo-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT demo-jaas-webapp Demo :: JAAS :: WebApp diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index 7732b7d2661..e7c433cc6e8 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/demos/demo-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml index ee76ec2bda1..893b9e59262 100644 --- a/demos/demo-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT demo-jndi-webapp Demo :: JNDI :: WebApp diff --git a/demos/demo-jsp-webapp/pom.xml b/demos/demo-jsp-webapp/pom.xml index 3a892ed0bbc..ad0e9c4eec8 100644 --- a/demos/demo-jsp-webapp/pom.xml +++ b/demos/demo-jsp-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/demos/demo-mock-resources/pom.xml b/demos/demo-mock-resources/pom.xml index 22674123ba5..ea1e334c75c 100644 --- a/demos/demo-mock-resources/pom.xml +++ b/demos/demo-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT Demo :: Mock Resources demo-mock-resources diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index 6973c2594a9..10c703d74ac 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 demo-proxy-webapp diff --git a/demos/demo-simple-webapp/pom.xml b/demos/demo-simple-webapp/pom.xml index 822e20e2da9..94ee75cd071 100644 --- a/demos/demo-simple-webapp/pom.xml +++ b/demos/demo-simple-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/demos/demo-spec/demo-container-initializer/pom.xml b/demos/demo-spec/demo-container-initializer/pom.xml index 9aea9f22b40..b4734724d84 100644 --- a/demos/demo-spec/demo-container-initializer/pom.xml +++ b/demos/demo-spec/demo-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT ../../pom.xml demo-container-initializer diff --git a/demos/demo-spec/demo-spec-webapp/pom.xml b/demos/demo-spec/demo-spec-webapp/pom.xml index cc3e5273501..9971df2f347 100644 --- a/demos/demo-spec/demo-spec-webapp/pom.xml +++ b/demos/demo-spec/demo-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT ../../pom.xml Demo :: Servlet Spec :: Webapp diff --git a/demos/demo-spec/demo-web-fragment/pom.xml b/demos/demo-spec/demo-web-fragment/pom.xml index 95ddaf77858..c0a1d8726bb 100644 --- a/demos/demo-spec/demo-web-fragment/pom.xml +++ b/demos/demo-spec/demo-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT ../../pom.xml diff --git a/demos/demo-spec/pom.xml b/demos/demo-spec/pom.xml index a6f806e69a9..495ff415f75 100644 --- a/demos/demo-spec/pom.xml +++ b/demos/demo-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT Demo :: Servlet Spec demo-spec diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml index 9b373788c13..52064bf17db 100644 --- a/demos/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.demos demos-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 demos-jetty-embedded diff --git a/demos/pom.xml b/demos/pom.xml index 12b0396888e..0a679e93acb 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 3c1014e61e7..20221ccd346 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 80748f96bec..7df2125846e 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.documentation documentation-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/documentation/pom.xml b/documentation/pom.xml index 409fc3fbfc1..77ea84424ae 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 1d61f5dd738..8d9ea4a9891 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index 3453c5bd813..2c3dc28563a 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 - 10.0.8 + 10.0.9-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 030350a0737..c25420a6d06 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 - 10.0.8 + 10.0.9-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 e2c6ce9fa53..18086f5788d 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 - 10.0.8 + 10.0.9-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 f67a03f161d..9d32fe1d247 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 - 10.0.8 + 10.0.9-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 1f8d7f6ea62..b8cd6fd3233 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 4c6a74f5926..d73b41a498a 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 3db59329a00..459e8b44fee 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 7e8d2ccfa67..a10cc6e95b7 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 3021f043227..ac189780ddf 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index cc3236c0e19..2f11f4173c1 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT jetty-bom @@ -53,419 +53,419 @@ org.eclipse.jetty apache-jsp - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty apache-jstl - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-alpn-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-alpn-java-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-alpn-java-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-alpn-conscrypt-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-alpn-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-annotations - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-ant - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-cdi - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-deploy - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.fcgi fcgi-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.fcgi fcgi-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.gcloud jetty-gcloud-session-manager - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-home - 10.0.8 + 10.0.9-SNAPSHOT zip org.eclipse.jetty jetty-home - 10.0.8 + 10.0.9-SNAPSHOT tar.gz org.eclipse.jetty jetty-http - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http2 http2-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http2 http2-common - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http2 http2-hpack - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http2 http2-http-client-transport - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http2 http2-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http3 http3-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http3 http3-common - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http3 http3-http-client-transport - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http3 http3-qpack - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.http3 http3-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-http-spi - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty infinispan-common - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty infinispan-remote - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty infinispan-remote-query - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty infinispan-embedded - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty infinispan-embedded-query - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-hazelcast - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-io - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-jaas - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-jaspi - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-jmx - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-jndi - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-keystore - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.memcached jetty-memcached-sessions - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-nosql - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-alpn - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-jsp - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.osgi jetty-osgi-boot-warurl - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.quic quic-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.quic quic-common - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.quic quic-quiche-common - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.quic quic-quiche-jna - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.quic quic-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.osgi jetty-httpservice - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-plus - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-proxy - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-quickstart - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-rewrite - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-security - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-openid - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-servlet - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-servlets - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-slf4j-impl - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-unixdomain-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-unixsocket-common - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-unixsocket-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-unixsocket-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-util - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-util-ajax - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-webapp - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-javax-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-javax-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-javax-common - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-api - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-common - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-jetty-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-servlet - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-core-common - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-core-client - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty.websocket websocket-core-server - 10.0.8 + 10.0.9-SNAPSHOT org.eclipse.jetty jetty-xml - 10.0.8 + 10.0.9-SNAPSHOT @@ -481,7 +481,7 @@ org.eclipse.jetty.quic quic-quiche-foreign-incubator - 10.0.8 + 10.0.9-SNAPSHOT diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 1512acea641..b7f1da49802 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 56fee66ae60..00f467c0373 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 6f00890f949..f8690c917ce 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index eac817a964b..31fcd9e59ca 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index acea812d7db..1623246c591 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index 779cf145442..95aeb9aca1d 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-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 d0d8f05f381..75f6c03a6c4 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 82e769e0c88..d7398bb3eb3 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index f3479477e4c..61041e5893a 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 9718f3d88b4..9e753037229 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-home diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 7729a22f29e..7c28f051663 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 70405a3afb0..b85fbaeb919 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index bb09fabfb77..425641e4d96 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index c5a6887005d..7037d897dc1 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 835cb91c7c1..937dc64b5f9 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 - 10.0.8 + 10.0.9-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 484104998b9..fb34e42f97a 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index d00ba89ac85..afcb31b8d38 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index c8db34ed275..65a1b5bec38 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-client/pom.xml b/jetty-http3/http3-client/pom.xml index 3eedc370308..23fe84096c4 100644 --- a/jetty-http3/http3-client/pom.xml +++ b/jetty-http3/http3-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-common/pom.xml b/jetty-http3/http3-common/pom.xml index a7f0ac766ae..1e105e85eea 100644 --- a/jetty-http3/http3-common/pom.xml +++ b/jetty-http3/http3-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-http-client-transport/pom.xml b/jetty-http3/http3-http-client-transport/pom.xml index f35a402e91f..746e0a89a79 100644 --- a/jetty-http3/http3-http-client-transport/pom.xml +++ b/jetty-http3/http3-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-qpack/pom.xml b/jetty-http3/http3-qpack/pom.xml index 41879556c1c..1c8eecf4513 100644 --- a/jetty-http3/http3-qpack/pom.xml +++ b/jetty-http3/http3-qpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-server/pom.xml b/jetty-http3/http3-server/pom.xml index 4b310f8a5a8..5cc12f17a6d 100644 --- a/jetty-http3/http3-server/pom.xml +++ b/jetty-http3/http3-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http3/http3-tests/pom.xml b/jetty-http3/http3-tests/pom.xml index b0db9d7c8ac..146fee540dc 100644 --- a/jetty-http3/http3-tests/pom.xml +++ b/jetty-http3/http3-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http3 http3-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-http3/pom.xml b/jetty-http3/pom.xml index ec862ba4f6c..511cd09c020 100644 --- a/jetty-http3/pom.xml +++ b/jetty-http3/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index 5903d928cb1..e43bc2c7fc9 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.8 + 10.0.9-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 446ce6484e8..260947e0683 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 infinispan-embedded-query diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index e6d98e0e453..64f589c408c 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.8 + 10.0.9-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 cee76e86367..9b7902a4066 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 infinispan-remote-query diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index 5a72519e516..a7256e6cedc 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty infinispan-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 infinispan-remote diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 9ee98b2f44c..6b53ea010a7 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 9a7fbe9fe40..7b99a5a1eab 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 8eb3fb8b334..80a89ee3e03 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 3e196834512..0c3ee03fc03 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 4d804707022..65278e55cfb 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 7df0e02c011..f07fde4650c 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 8d2da7aeefc..c61b930c6ed 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml index 1b8b21831ab..6f5b62fc0f4 100644 --- a/jetty-keystore/pom.xml +++ b/jetty-keystore/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-keystore diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 318c72e1fc1..77b271568c7 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-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 204b67c8de0..a612a443b23 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index 40bc94034b5..70e88ca872e 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 23a27588bb6..0e1bbc05964 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 00e8707ac68..57231a2c0e4 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index ee2a53cf1f8..cdfe0dfdb39 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 - 10.0.8 + 10.0.9-SNAPSHOT diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 4da7eb78ea1..370daec91d3 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 - 10.0.8 + 10.0.9-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 f892a3ba205..5aae5395213 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 - 10.0.8 + 10.0.9-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 29fea770566..b7f133a8fe4 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 - 10.0.8 + 10.0.9-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 90116db362b..2160ab773d0 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 29e0c124782..cb153805924 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-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 731a6bbde9b..6a3bc550763 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 - 10.0.8 + 10.0.9-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 46928408a73..e06654fab85 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 - 10.0.8 + 10.0.9-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 8f7f11a7231..0f435b50040 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 test-jetty-osgi-server diff --git a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml index f5217877bab..f9b89ce2eb7 100644 --- a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 test-jetty-osgi-webapp-resources diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index 237e2e62dfc..7d9c340bdb7 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 - 10.0.8 + 10.0.9-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 086fceb6dfb..0cdb82e6bf4 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 - 10.0.8 + 10.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index b9eb977b68c..c5d9bb5a460 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-p2 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 98ac9f79ac2..5adfc6f283d 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index c1d9abf91cc..6f832f8aafd 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-quic/pom.xml b/jetty-quic/pom.xml index 3ace03fc875..9b8cbdb0f41 100644 --- a/jetty-quic/pom.xml +++ b/jetty-quic/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-client/pom.xml b/jetty-quic/quic-client/pom.xml index 11fde0859fd..677ad15a071 100644 --- a/jetty-quic/quic-client/pom.xml +++ b/jetty-quic/quic-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-common/pom.xml b/jetty-quic/quic-common/pom.xml index b90e6933d96..2e6ed9c77fe 100644 --- a/jetty-quic/quic-common/pom.xml +++ b/jetty-quic/quic-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/pom.xml b/jetty-quic/quic-quiche/pom.xml index 8f9bbfbdaec..e70df2934e6 100644 --- a/jetty-quic/quic-quiche/pom.xml +++ b/jetty-quic/quic-quiche/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml index b2ba278b5a0..ab6c7f9dc0d 100644 --- a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml index 91eccefa9ee..213d1265b51 100644 --- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml index 2e4dca8d38d..fa28f3c46dc 100644 --- a/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-jna/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-quiche - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml index 0a42a3607e7..4a4ea9b05ab 100644 --- a/jetty-quic/quic-server/pom.xml +++ b/jetty-quic/quic-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.quic quic-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 933116a5b80..fc5b30342ec 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 3a163eb8561..898fa985d36 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 1159cb61cf7..4392ca47022 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index af91c3f9d23..937a43ad166 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 5c6fb6f0860..3aa447903ad 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 9ec5bdf3fb5..c4baba9575e 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index dbbe31e3237..e431164b191 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-slf4j-impl/pom.xml b/jetty-slf4j-impl/pom.xml index 1a2c89fa810..0a41131ef67 100644 --- a/jetty-slf4j-impl/pom.xml +++ b/jetty-slf4j-impl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index da03710814e..36e865487cf 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-unixdomain-server/pom.xml b/jetty-unixdomain-server/pom.xml index 680f78d33d2..13bc99af5a4 100644 --- a/jetty-unixdomain-server/pom.xml +++ b/jetty-unixdomain-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index 68671e90ef7..f074d360975 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 46e15be199c..450f65361f3 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-unixsocket - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index 5ceb4d59fd6..ed8670b9822 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -3,7 +3,7 @@ jetty-unixsocket org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 4f8e4128db5..e923bb7de0e 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 1e3a381b989..7571fe8c789 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index eee59dd951a..b0e5dd12eb3 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 07d8c80d66e..842d9517ea2 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index b69332a789e..fa7d1882b14 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml index 736c7e4126d..4f571b31349 100644 --- a/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-websocket/websocket-core-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml index 4ae6e028be4..67c47786e6a 100644 --- a/jetty-websocket/websocket-core-common/pom.xml +++ b/jetty-websocket/websocket-core-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml index 4be3a9f2fb3..4e74c678b9d 100644 --- a/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-websocket/websocket-core-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index 6062ef2a6ef..115ebd92014 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml index 083feffbfc2..325bf69407e 100644 --- a/jetty-websocket/websocket-javax-client/pom.xml +++ b/jetty-websocket/websocket-javax-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index 723064321c5..45c265c5d08 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index 305ad77cae8..e0d7e9846d4 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index d990d290f5a..f20d8b8238f 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-api/pom.xml b/jetty-websocket/websocket-jetty-api/pom.xml index abe555427c2..e3ffe8fd2a8 100644 --- a/jetty-websocket/websocket-jetty-api/pom.xml +++ b/jetty-websocket/websocket-jetty-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index 02b091ec632..e816fbd080c 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index cce1e4b6be3..b5fe2e8d2cc 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index 340e0dea503..3e118201019 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index bb8fc2db0a8..f4742245ce0 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 732a1d3b049..c2dcf97b3f1 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 923bf4c4f11..8f90723006f 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 770ecdf9f0c..2c27638d6ef 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT Jetty :: Project The Eclipse Jetty Project pom diff --git a/tests/jetty-http-tools/pom.xml b/tests/jetty-http-tools/pom.xml index 6e206d8df17..1066501feeb 100644 --- a/tests/jetty-http-tools/pom.xml +++ b/tests/jetty-http-tools/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 420d2a73927..c02e0419da2 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index 07cc0ec61d3..396482f790f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 10.0.8 + 10.0.9-SNAPSHOT ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index 0c793b2805d..1102d3ab857 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index f84b97fdec0..571f1152992 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index bf5c9825d5b..e82e514e2d9 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 825f5bf8245..11dc3cc0311 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-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 4cf4e0db1ac..22adca6e03f 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 - 10.0.8 + 10.0.9-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 d255c8834a7..b84c566606c 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 - 10.0.8 + 10.0.9-SNAPSHOT jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index d5f52182888..ab1e065c159 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 test-jmx-parent diff --git a/tests/test-jpms/pom.xml b/tests/test-jpms/pom.xml index 48a80d5bd66..1e59d4731a0 100644 --- a/tests/test-jpms/pom.xml +++ b/tests/test-jpms/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 test-jpms diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index b0bfc6cdd73..871068e584d 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -3,7 +3,7 @@ test-jpms org.eclipse.jetty.tests - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 test-jpms-websocket-core diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 4262f652dc5..dd370df6819 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 5fc26816eb1..6d6f6e3a2e0 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 13a82cf1fc7..024880b2406 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-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 84563b425ed..1965c3f253d 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 - 10.0.8 + 10.0.9-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 5816926a8ef..4c22236fc7a 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 - 10.0.8 + 10.0.9-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 1d488250635..e3eb70b7333 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 - 10.0.8 + 10.0.9-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 21792d9c923..541b48ef5ee 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 - 10.0.8 + 10.0.9-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 03e50e73034..cb3ab4f0d87 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 - 10.0.8 + 10.0.9-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 9b204b05acf..7e544bb55de 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 - 10.0.8 + 10.0.9-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 148f5ad84b1..ab6990634a6 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 - 10.0.8 + 10.0.9-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 49a13904546..d34f0f81168 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 - 10.0.8 + 10.0.9-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 93f0248b654..0f0bf9e3ee2 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index 3a610756bf4..c3b96a9fc92 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index ac58d6166c5..f70947f53bc 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 - 10.0.8 + 10.0.9-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 fa227272bc3..42b5a004687 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 - 10.0.8 + 10.0.9-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 ef850dde954..bf7196ea3a6 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 33a1b53eb97..0e36f899432 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-simple-session-webapp/pom.xml b/tests/test-webapps/test-simple-session-webapp/pom.xml index e5b2311af94..3fd0e4ee89c 100644 --- a/tests/test-webapps/test-simple-session-webapp/pom.xml +++ b/tests/test-webapps/test-simple-session-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8 + 10.0.9-SNAPSHOT test-simple-session-webapp diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 295b4e6a420..0355793e155 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 - 10.0.8 + 10.0.9-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml index 620be6da0b9..8546125acd4 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-websocket-client-webapp/pom.xml b/tests/test-webapps/test-websocket-client-webapp/pom.xml index 67e79034643..3c00adf5401 100644 --- a/tests/test-webapps/test-websocket-client-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index cff37984db0..ddf4a61226a 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index a3c54acc73d..92955506f1a 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 - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 diff --git a/tests/test-websocket-autobahn/pom.xml b/tests/test-websocket-autobahn/pom.xml index 23836e66b3b..bc09e18ecd5 100644 --- a/tests/test-websocket-autobahn/pom.xml +++ b/tests/test-websocket-autobahn/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 10.0.8 + 10.0.9-SNAPSHOT 4.0.0 From 67532c85f0a22b721e757e359709e1b5f3ca7836 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 7 Feb 2022 17:08:52 +0100 Subject: [PATCH 06/39] Updated VERSION.txt with 9.4.44 (missing from a previous merge) and 9.4.45 releases. Signed-off-by: Simone Bordet --- VERSION.txt | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/VERSION.txt b/VERSION.txt index 4de3ddf3159..4dfbaefbad0 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -63,6 +63,34 @@ jetty-10.0.8 - 07 February 2022 + 7524 Missing package in JmxConfiguration + 7529 Upgrade quiche to version 0.11.0 +jetty-9.4.45.v20220203 - 03 February 2022 + + 4275 Path Normalization/Traversal - Context Matching + + 6497 Replace SameFileAliasChecker + + 6687 Upgrade Infinispan in all active Jetty branches + + 6965 Expose Spec `ServerContainer.upgrade()` API + + 6969 Getting 404 failures when trying to enable `logging-log4j` module. + + 6974 Major websocket memory change in 9.4.36 + + 7031 ResponseWriter.println(char) does not print newline + + 7059 NPE in AllowedResourceAliasChecker.getPath() + + 7073 Error in parse parameter in broken UTF-8 encoding + + 7078 CompressionPools are not shared between multiple contexts for 9.4 + WebSocket + + 7107 Client timeout and async close exceptions when setting max duration on + pool + + 7124 Add default methods on LifeCycle.Listener interface + + 7157 Multiplexed connection pools retain CLOSED entries + + 7243 Reset pooled ByteBuffer endianness + + 7266 Wrong ALPN jars are selected for newer versions of JDK8 + + 7271 It is necessary to set MAX_CAPACITY to ArrayTernaryTrie/ArrayTrie + + 7277 Allow override of `ServletRequest.getLocalName()` and `.getLocalPort()` + in post-intermediary scenarios + + 7297 Deprecate log4j 1.x support + + 7348 Slow CONNECT request causes NPE + + 7375 Some environments require Request scoping during session save + + 7435 Investigate Infinispan transitive dependencies + + 7440 ContextHandler.getAliasChecks() breaks Spring Boot + + 7496 Transient 400: Bad Request responses in jetty-9.4.45.v20220128 + jetty-10.0.7 - 06 October 2021 + 3514 Use interpolation of versions from pom in mod files + 6043 Reimplement UnixSocket support based on Java 16 @@ -120,6 +148,32 @@ jetty-10.0.7 - 06 October 2021 + 6883 Welcome file redirects do not honor the relativeRedirectAllowed option + 6938 module-info.java file do not use the canonical order for the elements +jetty-9.4.44.v20210927 - 27 September 2021 + + 3514 Use interpolation of versions from pom in mod files + + 6369 Increment default jetty.http2.rateControl.maxEventsPerSecond + + 6372 Review socket options configuration + + 6487 Expose ServletHolder getter in ServletHandler$ChainEnd for auditing + libraries to use + + 6491 onDataAvailable() not called when HttpParser is closed prematurely + + 6520 Error page has HTML error when writePoweredBy is enabled + + 6545 image/webp MIME type support + + 6553 Review usage of Authentication.UNAUTHENTICATED in SecurityHandler + + 6554 Allow creation of DefaultIdentityService without realmName + + 6558 Allow to configure return type in JSON array parsing + + 6562 HttpOutput.write(ByteBuffer buffer) + + 6603 HTTP/2 max local stream count exceeded + + 6617 Add basic auth support for OpenId token endpoint (client_secret_basic) + + 6618 ID token `azp` claim should not be required if `aud` is single value + array + + 6652 Improve ReservedThreadExecutor dump + + 6671 Update to apache jsp 8.5.70 + + 6772 Update to asm 9.2 + + 6853 Remove pack200 plugins + + 6860 Correct IPv6 format + + 6869 Correct Content-Type within HTML error pages + + 6870 Encode control characters in URIUtil.encodePath + + 6883 Welcome file redirects do not honor the relativeRedirectAllowed option + jetty-10.0.6 - 29 June 2021 + 6375 Always check XML `Set` elements with `property` attribute + 6382 HttpClient TimeoutException message reports transient values From 9e41227a3b81111783401f0efe15cedb775266b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 12:08:45 -0600 Subject: [PATCH 07/39] Bump maven-project-info-reports-plugin from 3.1.2 to 3.2.1 (#7543) Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.1.2 to 3.2.1. - [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases) - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.1.2...maven-project-info-reports-plugin-3.2.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c27638d6ef..e7452dd5a49 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 3.1.1 3.6.4 3.6.4 - 3.1.2 + 3.2.1 2.5.3 1.7.0 3.2.0 From bdc60ee7119d70c73a3122fbfe4572d060bb2a3b Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 8 Feb 2022 06:20:50 +1100 Subject: [PATCH 08/39] Jetty 10.0.x #7517 #7518 trie fixes (#7533) * Fix #7518 Trie.getBest with empty Key (#7527) Fix #7518 Trie.getBest with empty Key * Only increment current row if not recursing. * Fixed match ending with big char Signed-off-by: Greg Wilkins * Jetty 9.4.x 7517 trie stack overflow (#7528) Fix #7518 Trie stack overflows * Avoid recursion where possible Signed-off-by: Greg Wilkins * Added extra tests Signed-off-by: Greg Wilkins * removed empty file Signed-off-by: Greg Wilkins --- .../java/org/eclipse/jetty/util/TreeTrie.java | 61 +++++++++++-------- .../java/org/eclipse/jetty/util/TrieTest.java | 52 +++++++++++++++- 2 files changed, 85 insertions(+), 28 deletions(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/TreeTrie.java b/jetty-util/src/main/java/org/eclipse/jetty/util/TreeTrie.java index a96446f6aec..77507d3e1ed 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/TreeTrie.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/TreeTrie.java @@ -231,44 +231,46 @@ class TreeTrie extends AbstractTrie return getBest(_root, b, offset, len); } - private V getBest(Node t, byte[] b, int offset, int len) + private V getBest(Node node, byte[] b, int offset, int len) { for (int i = 0; i < len; i++) { + Node next; byte c = b[offset + i]; int index = c >= 0 && c < 0x7f ? _lookup[c] : -1; if (index >= 0) { - if (t._nextIndex[index] == null) + if (node._nextIndex[index] == null) break; - t = t._nextIndex[index]; + next = node._nextIndex[index]; } else { Node n = null; - for (int j = t._nextOther.size(); j-- > 0; ) + for (int j = node._nextOther.size(); j-- > 0; ) { - n = t._nextOther.get(j); + n = node._nextOther.get(j); if (n._c == c) break; n = null; } if (n == null) break; - t = n; + next = n; } // Is the next Trie is a match - if (t._key != null) + if (node._key != null) { // Recurse so we can remember this possibility - V best = getBest(t, b, offset + i + 1, len - i - 1); + V best = getBest(next, b, offset + i + 1, len - i - 1); if (best != null) return best; break; } + node = next; } - return t._value; + return node._value; } @Override @@ -289,44 +291,47 @@ class TreeTrie extends AbstractTrie return getBest(_root, s, offset, len); } - private V getBest(Node t, String s, int offset, int len) + private V getBest(Node node, String s, int offset, int len) { for (int i = 0; i < len; i++) { + Node next; char c = s.charAt(offset + i); int index = c < 0x7f ? _lookup[c] : -1; if (index >= 0) { - if (t._nextIndex[index] == null) + if (node._nextIndex[index] == null) break; - t = t._nextIndex[index]; + next = node._nextIndex[index]; } else { Node n = null; - for (int j = t._nextOther.size(); j-- > 0; ) + for (int j = node._nextOther.size(); j-- > 0; ) { - n = t._nextOther.get(j); + n = node._nextOther.get(j); if (n._c == c) break; n = null; } if (n == null) break; - t = n; + next = n; } // Is the next Trie is a match - if (t._key != null) + if (node._key != null) { // Recurse so we can remember this possibility - V best = getBest(t, s, offset + i + 1, len - i - 1); + V best = getBest(next, s, offset + i + 1, len - i - 1); if (best != null) return best; break; } + + node = next; } - return t._value; + return node._value; } @Override @@ -337,8 +342,9 @@ class TreeTrie extends AbstractTrie return getBest(_root, b, offset, len); } - private V getBest(Node t, ByteBuffer b, int offset, int len) + private V getBest(Node node, ByteBuffer b, int offset, int len) { + Node next; int pos = b.position() + offset; for (int i = 0; i < len; i++) { @@ -346,36 +352,37 @@ class TreeTrie extends AbstractTrie int index = c >= 0 && c < 0x7f ? _lookup[c] : -1; if (index >= 0) { - if (t._nextIndex[index] == null) + if (node._nextIndex[index] == null) break; - t = t._nextIndex[index]; + next = node._nextIndex[index]; } else { Node n = null; - for (int j = t._nextOther.size(); j-- > 0; ) + for (int j = node._nextOther.size(); j-- > 0; ) { - n = t._nextOther.get(j); + n = node._nextOther.get(j); if (n._c == c) break; n = null; } if (n == null) break; - t = n; + next = n; } // Is the next Trie is a match - if (t._key != null) + if (node._key != null) { // Recurse so we can remember this possibility - V best = getBest(t, b, offset + i + 1, len - i - 1); + V best = getBest(next, b, offset + i + 1, len - i - 1); if (best != null) return best; break; } + node = next; } - return t._value; + return node._value; } @Override diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java index 58c531a1e12..28a7aa3b917 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/TrieTest.java @@ -29,9 +29,10 @@ import org.junit.jupiter.params.provider.MethodSource; import static org.eclipse.jetty.util.AbstractTrie.requiredCapacity; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -115,6 +116,20 @@ public class TrieTest return impls.stream().map(Arguments::of); } + public static Stream emptyImplementations() + { + List> impls = new ArrayList<>(); + + for (boolean caseSensitive : new boolean[] {true, false}) + { + impls.add(new ArrayTrie(caseSensitive, 128)); + impls.add(new ArrayTernaryTrie(caseSensitive, 128)); + impls.add(new TreeTrie<>(caseSensitive)); + } + + return impls.stream().map(Arguments::of); + } + @ParameterizedTest @MethodSource("implementations") public void testOverflow(AbstractTrie trie) throws Exception @@ -432,6 +447,38 @@ public class TrieTest assertThat(trie.getBest(key + ";xxxx"), is(103)); } + @ParameterizedTest + @MethodSource("emptyImplementations") + public void testHttp(AbstractTrie trie) + { + trie.put("Host:", 1); + trie.put("Host: name", 2); + + assertThat(trie.getBest("Other: header\r\n"), nullValue()); + assertThat(trie.getBest("Host: other\r\n"), is(1)); + assertThat(trie.getBest("Host: name\r\n"), is(2)); + if (trie.isCaseInsensitive()) + assertThat(trie.getBest("HoSt: nAme\r\n"), is(2)); + else + assertThat(trie.getBest("HoSt: nAme\r\n"), nullValue()); + + assertThat(trie.getBest(BufferUtil.toBuffer("Other: header\r\n")), nullValue()); + assertThat(trie.getBest(BufferUtil.toBuffer("Host: other\r\n")), is(1)); + assertThat(trie.getBest(BufferUtil.toBuffer("Host: name\r\n")), is(2)); + if (trie.isCaseInsensitive()) + assertThat(trie.getBest(BufferUtil.toBuffer("HoSt: nAme\r\n")), is(2)); + else + assertThat(trie.getBest(BufferUtil.toBuffer("HoSt: nAme\r\n")), nullValue()); + + assertThat(trie.getBest(BufferUtil.toDirectBuffer("Other: header\r\n")), nullValue()); + assertThat(trie.getBest(BufferUtil.toDirectBuffer("Host: other\r\n")), is(1)); + assertThat(trie.getBest(BufferUtil.toDirectBuffer("Host: name\r\n")), is(2)); + if (trie.isCaseInsensitive()) + assertThat(trie.getBest(BufferUtil.toDirectBuffer("HoSt: nAme\r\n")), is(2)); + else + assertThat(trie.getBest(BufferUtil.toDirectBuffer("HoSt: nAme\r\n")), nullValue()); + } + @Test public void testArrayTrieCapacity() { @@ -441,5 +488,8 @@ public class TrieTest assertThat(trie.get(huge), is("wow")); assertThrows(IllegalArgumentException.class, () -> new ArrayTrie(Character.MAX_VALUE + 1)); + + assertThat(trie.keySet(), contains(huge)); + assertThat(trie.toString(), containsString(huge)); } } From c742c2ef9d0d8414ff8a0888df9cf7c7d2fdb172 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 8 Feb 2022 14:27:33 +1100 Subject: [PATCH 09/39] Issue #7414 Deprecate QoSFilter setters (#7506) * Issue #7414 Deprecate QoSFilter setters Signed-off-by: Jan Bartel --- .../java/org/eclipse/jetty/servlets/QoSFilter.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java index d31f0aa146f..c4f7b7c298d 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java @@ -293,10 +293,12 @@ public class QoSFilter implements Filter * for the semaphore to become available before suspending a request. * * @param value wait time (in milliseconds) + * @deprecated use init-param waitMs instead */ + @Deprecated public void setWaitMs(long value) { - _waitMs = value; + LOG.warn("Setter ignored: use waitMs init-param for QoSFilter"); } /** @@ -316,10 +318,12 @@ public class QoSFilter implements Filter * a request for while waiting for the semaphore to become available. * * @param value suspend time (in milliseconds) + * @deprecated use init-param suspendMs instead */ + @Deprecated public void setSuspendMs(long value) { - _suspendMs = value; + LOG.warn("Setter ignored: use suspendMs init-param for QoSFilter"); } /** @@ -339,11 +343,12 @@ public class QoSFilter implements Filter * at the same time. * * @param value the number of requests + * @deprecated use init-param maxRequests instead */ + @Deprecated public void setMaxRequests(int value) { - _passes = new Semaphore((value - getMaxRequests() + _passes.availablePermits()), true); - _maxRequests = value; + LOG.warn("Setter ignored: use maxRequests init-param for QoSFilter instead"); } private class QoSAsyncListener implements AsyncListener From 58c230e26c7c226738b93ba3cdc508d7db05b507 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 8 Feb 2022 15:28:02 +1100 Subject: [PATCH 10/39] Issue #7545 - add distribution test for jetty-openid so that we can test XML Signed-off-by: Lachlan Roberts --- tests/test-distribution/pom.xml | 5 + .../tests/distribution/DistributionTests.java | 86 +++++ .../tests/distribution/openid/JwtEncoder.java | 53 +++ .../distribution/openid/OpenIdProvider.java | 341 ++++++++++++++++++ tests/test-webapps/pom.xml | 1 + tests/test-webapps/test-openid-webapp/pom.xml | 31 ++ .../eclipse/jetty/test/openid/AdminPage.java | 31 ++ .../eclipse/jetty/test/openid/ErrorPage.java | 30 ++ .../eclipse/jetty/test/openid/HomePage.java | 45 +++ .../eclipse/jetty/test/openid/LoginPage.java | 30 ++ .../eclipse/jetty/test/openid/LogoutPage.java | 29 ++ .../src/main/webapp/WEB-INF/web.xml | 86 +++++ 12 files changed, 768 insertions(+) create mode 100644 tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/openid/JwtEncoder.java create mode 100644 tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/openid/OpenIdProvider.java create mode 100644 tests/test-webapps/test-openid-webapp/pom.xml create mode 100644 tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java create mode 100644 tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java create mode 100644 tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java create mode 100644 tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java create mode 100644 tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java create mode 100644 tests/test-webapps/test-openid-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 1c866241043..915051225b9 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -149,6 +149,11 @@ websocket-jetty-api test + + org.eclipse.jetty + jetty-openid + test + org.eclipse.jetty.tests test-felix-webapp diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 9879b83005c..92be9255198 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -41,6 +41,7 @@ import org.eclipse.jetty.http3.client.HTTP3Client; import org.eclipse.jetty.http3.client.http.HttpClientTransportOverHTTP3; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.start.FS; +import org.eclipse.jetty.tests.distribution.openid.OpenIdProvider; import org.eclipse.jetty.toolchain.test.PathAssert; import org.eclipse.jetty.unixsocket.client.HttpClientTransportOverUnixSockets; import org.eclipse.jetty.unixsocket.server.UnixSocketConnector; @@ -1143,4 +1144,89 @@ public class DistributionTests extends AbstractJettyHomeTest } } } + + @Test + public void testOpenID() throws Exception + { + Path jettyBase = newTestJettyBaseDirectory(); + String jettyVersion = System.getProperty("jettyVersion"); + JettyHomeTester distribution = JettyHomeTester.Builder.newInstance() + .jettyVersion(jettyVersion) + .jettyBase(jettyBase) + .mavenLocalRepository(System.getProperty("mavenRepoPath")) + .build(); + + String[] args1 = { + "--create-startd", + "--approve-all-licenses", + "--add-to-start=http,webapp,deploy,openid" + }; + + String clientId = "clientId123"; + String clientSecret = "clientSecret456"; + OpenIdProvider openIdProvider = new OpenIdProvider(clientId, clientSecret); + try (JettyHomeTester.Run run1 = distribution.start(args1)) + { + assertTrue(run1.awaitFor(10, TimeUnit.SECONDS)); + assertEquals(0, run1.getExitValue()); + + File webApp = distribution.resolveArtifact("org.eclipse.jetty.tests:test-openid-webapp:war:" + jettyVersion); + distribution.installWarFile(webApp, "test"); + + int port = distribution.freePort(); + openIdProvider.addRedirectUri("http://localhost:" + port + "/test/j_security_check"); + openIdProvider.start(); + String[] args2 = { + "jetty.http.port=" + port, + "jetty.ssl.port=" + port, + "jetty.openid.provider=" + openIdProvider.getProvider(), + "jetty.openid.clientId=" + clientId, + "jetty.openid.clientSecret=" + clientSecret, + //"jetty.server.dumpAfterStart=true", + }; + + try (JettyHomeTester.Run run2 = distribution.start(args2)) + { + assertTrue(run2.awaitConsoleLogsFor("Started Server@", 10, TimeUnit.SECONDS)); + startHttpClient(false); + String uri = "http://localhost:" + port + "/test"; + openIdProvider.setUser(new OpenIdProvider.User("123456789", "Alice")); + + // Initially not authenticated + ContentResponse response = client.GET(uri + "/"); + assertThat(response.getStatus(), is(HttpStatus.OK_200)); + String content = response.getContentAsString(); + assertThat(content, containsString("not authenticated")); + + // Request to login is success + response = client.GET(uri + "/login"); + assertThat(response.getStatus(), is(HttpStatus.OK_200)); + content = response.getContentAsString(); + assertThat(content, containsString("success")); + + // Now authenticated we can get info + response = client.GET(uri + "/"); + assertThat(response.getStatus(), is(HttpStatus.OK_200)); + content = response.getContentAsString(); + assertThat(content, containsString("userId: 123456789")); + assertThat(content, containsString("name: Alice")); + assertThat(content, containsString("email: Alice@example.com")); + + // Request to admin page gives 403 as we do not have admin role + response = client.GET(uri + "/admin"); + assertThat(response.getStatus(), is(HttpStatus.FORBIDDEN_403)); + + // We are no longer authenticated after logging out + response = client.GET(uri + "/logout"); + assertThat(response.getStatus(), is(HttpStatus.OK_200)); + content = response.getContentAsString(); + assertThat(content, containsString("not authenticated")); + + } + } + finally + { + openIdProvider.stop(); + } + } } diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/openid/JwtEncoder.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/openid/JwtEncoder.java new file mode 100644 index 00000000000..91036b37949 --- /dev/null +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/openid/JwtEncoder.java @@ -0,0 +1,53 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.tests.distribution.openid; + +import java.util.Base64; + +/** + * A basic JWT encoder for testing purposes. + */ +public class JwtEncoder +{ + private static final Base64.Encoder ENCODER = Base64.getUrlEncoder(); + private static final String DEFAULT_HEADER = "{\"INFO\": \"this is not used or checked in our implementation\"}"; + private static final String DEFAULT_SIGNATURE = "we do not validate signature as we use the authorization code flow"; + + public static String encode(String idToken) + { + return stripPadding(ENCODER.encodeToString(DEFAULT_HEADER.getBytes())) + "." + + stripPadding(ENCODER.encodeToString(idToken.getBytes())) + "." + + stripPadding(ENCODER.encodeToString(DEFAULT_SIGNATURE.getBytes())); + } + + private static String stripPadding(String paddedBase64) + { + return paddedBase64.split("=")[0]; + } + + /** + * Create a basic JWT for testing using argument supplied attributes. + */ + public static String createIdToken(String provider, String clientId, String subject, String name, long expiry) + { + return "{" + + "\"iss\": \"" + provider + "\"," + + "\"sub\": \"" + subject + "\"," + + "\"aud\": \"" + clientId + "\"," + + "\"exp\": " + expiry + "," + + "\"name\": \"" + name + "\"," + + "\"email\": \"" + name + "@example.com" + "\"" + + "}"; + } +} diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/openid/OpenIdProvider.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/openid/OpenIdProvider.java new file mode 100644 index 00000000000..4eaa11a119a --- /dev/null +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/openid/OpenIdProvider.java @@ -0,0 +1,341 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.tests.distribution.openid; + +import java.io.IOException; +import java.io.PrintWriter; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.http.HttpVersion; +import org.eclipse.jetty.security.openid.OpenIdConfiguration; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Response; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.util.StringUtil; +import org.eclipse.jetty.util.component.ContainerLifeCycle; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class OpenIdProvider extends ContainerLifeCycle +{ + private static final Logger LOG = LoggerFactory.getLogger(OpenIdProvider.class); + + private static final String CONFIG_PATH = "/.well-known/openid-configuration"; + private static final String AUTH_PATH = "/auth"; + private static final String TOKEN_PATH = "/token"; + private final Map issuedAuthCodes = new HashMap<>(); + + protected final String clientId; + protected final String clientSecret; + protected final List redirectUris = new ArrayList<>(); + private final ServerConnector connector; + private final Server server; + private int port = 0; + private String provider; + private User preAuthedUser; + + public static void main(String[] args) throws Exception + { + String clientId = "CLIENT_ID123"; + String clientSecret = "PASSWORD123"; + int port = 5771; + String redirectUri = "http://localhost:8080/openid/auth"; + + OpenIdProvider openIdProvider = new OpenIdProvider(clientId, clientSecret); + openIdProvider.addRedirectUri(redirectUri); + openIdProvider.setPort(port); + openIdProvider.start(); + try + { + openIdProvider.join(); + } + finally + { + openIdProvider.stop(); + } + } + + public OpenIdProvider(String clientId, String clientSecret) + { + this.clientId = clientId; + this.clientSecret = clientSecret; + + server = new Server(); + connector = new ServerConnector(server); + server.addConnector(connector); + + ServletContextHandler contextHandler = new ServletContextHandler(); + contextHandler.setContextPath("/"); + contextHandler.addServlet(new ServletHolder(new OpenIdConfigServlet()), CONFIG_PATH); + contextHandler.addServlet(new ServletHolder(new OpenIdAuthEndpoint()), AUTH_PATH); + contextHandler.addServlet(new ServletHolder(new OpenIdTokenEndpoint()), TOKEN_PATH); + server.setHandler(contextHandler); + + addBean(server); + } + + public void join() throws InterruptedException + { + server.join(); + } + + public OpenIdConfiguration getOpenIdConfiguration() + { + String provider = getProvider(); + String authEndpoint = provider + AUTH_PATH; + String tokenEndpoint = provider + TOKEN_PATH; + return new OpenIdConfiguration(provider, authEndpoint, tokenEndpoint, clientId, clientSecret, null); + } + + @Override + protected void doStart() throws Exception + { + connector.setPort(port); + super.doStart(); + provider = "http://localhost:" + connector.getLocalPort(); + } + + public void setPort(int port) + { + if (isStarted()) + throw new IllegalStateException(); + this.port = port; + } + + public void setUser(User user) + { + this.preAuthedUser = user; + } + + public String getProvider() + { + if (!isStarted() && port == 0) + throw new IllegalStateException("Port of OpenIdProvider not configured"); + return provider; + } + + public void addRedirectUri(String uri) + { + redirectUris.add(uri); + } + + public class OpenIdAuthEndpoint extends HttpServlet + { + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException + { + if (!clientId.equals(req.getParameter("client_id"))) + { + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "invalid client_id"); + return; + } + + String redirectUri = req.getParameter("redirect_uri"); + if (!redirectUris.contains(redirectUri)) + { + LOG.warn("invalid redirectUri {}", redirectUri); + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "invalid redirect_uri"); + return; + } + + String scopeString = req.getParameter("scope"); + List scopes = (scopeString == null) ? Collections.emptyList() : Arrays.asList(StringUtil.csvSplit(scopeString)); + if (!scopes.contains("openid")) + { + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "no openid scope"); + return; + } + + if (!"code".equals(req.getParameter("response_type"))) + { + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "response_type must be code"); + return; + } + + String state = req.getParameter("state"); + if (state == null) + { + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "no state param"); + return; + } + + if (preAuthedUser == null) + { + PrintWriter writer = resp.getWriter(); + resp.setContentType("text/html"); + writer.println("

Login to OpenID Connect Provider

"); + writer.println("
"); + writer.println(""); + writer.println(""); + writer.println(""); + writer.println(""); + writer.println("
"); + } + else + { + redirectUser(req, preAuthedUser, redirectUri, state); + } + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException + { + String redirectUri = req.getParameter("redirectUri"); + if (!redirectUris.contains(redirectUri)) + { + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "invalid redirect_uri"); + return; + } + + String state = req.getParameter("state"); + if (state == null) + { + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "no state param"); + return; + } + + String username = req.getParameter("username"); + if (username == null) + { + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "no username"); + return; + } + + User user = new User(username); + redirectUser(req, user, redirectUri, state); + } + + public void redirectUser(HttpServletRequest request, User user, String redirectUri, String state) throws IOException + { + String authCode = UUID.randomUUID().toString().replace("-", ""); + issuedAuthCodes.put(authCode, user); + + try + { + final Request baseRequest = Objects.requireNonNull(Request.getBaseRequest(request)); + final Response baseResponse = baseRequest.getResponse(); + redirectUri += "?code=" + authCode + "&state=" + state; + int redirectCode = (baseRequest.getHttpVersion().getVersion() < HttpVersion.HTTP_1_1.getVersion() + ? HttpServletResponse.SC_MOVED_TEMPORARILY : HttpServletResponse.SC_SEE_OTHER); + baseResponse.sendRedirect(redirectCode, baseResponse.encodeRedirectURL(redirectUri)); + } + catch (Throwable t) + { + issuedAuthCodes.remove(authCode); + throw t; + } + } + } + + public class OpenIdTokenEndpoint extends HttpServlet + { + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + String code = req.getParameter("code"); + + if (!clientId.equals(req.getParameter("client_id")) || + !clientSecret.equals(req.getParameter("client_secret")) || + !redirectUris.contains(req.getParameter("redirect_uri")) || + !"authorization_code".equals(req.getParameter("grant_type")) || + code == null) + { + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "bad auth request"); + return; + } + + User user = issuedAuthCodes.remove(code); + if (user == null) + { + resp.sendError(HttpServletResponse.SC_FORBIDDEN, "invalid auth code"); + return; + } + + String accessToken = "ABCDEFG"; + long expiry = System.currentTimeMillis() + Duration.ofMinutes(10).toMillis(); + String response = "{" + + "\"access_token\": \"" + accessToken + "\"," + + "\"id_token\": \"" + JwtEncoder.encode(user.getIdToken(provider, clientId)) + "\"," + + "\"expires_in\": " + expiry + "," + + "\"token_type\": \"Bearer\"" + + "}"; + + resp.setContentType("text/plain"); + resp.getWriter().print(response); + } + } + + public class OpenIdConfigServlet extends HttpServlet + { + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException + { + String discoveryDocument = "{" + + "\"issuer\": \"" + provider + "\"," + + "\"authorization_endpoint\": \"" + provider + AUTH_PATH + "\"," + + "\"token_endpoint\": \"" + provider + TOKEN_PATH + "\"," + + "}"; + + resp.getWriter().write(discoveryDocument); + } + } + + public static class User + { + private final String subject; + private final String name; + + public User(String name) + { + this(UUID.nameUUIDFromBytes(name.getBytes()).toString(), name); + } + + public User(String subject, String name) + { + this.subject = subject; + this.name = name; + } + + public String getName() + { + return name; + } + + public String getSubject() + { + return subject; + } + + public String getIdToken(String provider, String clientId) + { + long expiry = System.currentTimeMillis() + Duration.ofMinutes(1).toMillis(); + return JwtEncoder.createIdToken(provider, clientId, subject, name, expiry); + } + } +} diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 42ebd00ddf1..b01893ec112 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -41,5 +41,6 @@ test-bad-websocket-webapp test-websocket-client-webapp test-websocket-client-provided-webapp + test-openid-webapp diff --git a/tests/test-webapps/test-openid-webapp/pom.xml b/tests/test-webapps/test-openid-webapp/pom.xml new file mode 100644 index 00000000000..0b104437dfa --- /dev/null +++ b/tests/test-webapps/test-openid-webapp/pom.xml @@ -0,0 +1,31 @@ + + + + org.eclipse.jetty.tests + test-webapps-parent + 10.0.8-SNAPSHOT + + + 4.0.0 + test-openid-webapp + war + + Test :: Jetty OpenId Webapp + + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + compile + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java new file mode 100644 index 00000000000..e7f252b6b80 --- /dev/null +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java @@ -0,0 +1,31 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.test.openid; + +import java.io.IOException; +import java.util.Map; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class AdminPage extends HttpServlet +{ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException + { + @SuppressWarnings("unchecked") + Map userInfo = (Map)request.getSession().getAttribute("org.eclipse.jetty.security.openid.claims"); + response.getWriter().println(userInfo.get("sub") + ": success"); + } +} \ No newline at end of file diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java new file mode 100644 index 00000000000..c975847ac12 --- /dev/null +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.test.openid; + +import java.io.IOException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class ErrorPage extends HttpServlet +{ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException + { + response.setContentType("text/html"); + response.getWriter().println("not authorized"); + response.getWriter().println("
Home"); + } +} \ No newline at end of file diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java new file mode 100644 index 00000000000..ca5cca9c048 --- /dev/null +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java @@ -0,0 +1,45 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.test.openid; + +import java.io.IOException; +import java.security.Principal; +import java.util.Map; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class HomePage extends HttpServlet +{ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException + { + response.setContentType("text/html"); + Principal userPrincipal = request.getUserPrincipal(); + if (userPrincipal != null) + { + @SuppressWarnings("unchecked") + Map userInfo = (Map)request.getSession().getAttribute("org.eclipse.jetty.security.openid.claims"); + response.getWriter().println("userId: " + userInfo.get("sub") + "
"); + response.getWriter().println("name: " + userInfo.get("name") + "
"); + response.getWriter().println("email: " + userInfo.get("email") + "
"); + response.getWriter().println("
Logout"); + } + else + { + response.getWriter().println("not authenticated"); + response.getWriter().println("
Login"); + } + } +} \ No newline at end of file diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java new file mode 100644 index 00000000000..7f0b351ff11 --- /dev/null +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.test.openid; + +import java.io.IOException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class LoginPage extends HttpServlet +{ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException + { + response.setContentType("text/html"); + response.getWriter().println("success"); + response.getWriter().println("
Home"); + } +} \ No newline at end of file diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java new file mode 100644 index 00000000000..ac79242c24b --- /dev/null +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java @@ -0,0 +1,29 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.test.openid; + +import java.io.IOException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class LogoutPage extends HttpServlet +{ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException + { + request.getSession().invalidate(); + response.sendRedirect(request.getContextPath()); + } +} \ No newline at end of file diff --git a/tests/test-webapps/test-openid-webapp/src/main/webapp/WEB-INF/web.xml b/tests/test-webapps/test-openid-webapp/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 00000000000..1464c57acca --- /dev/null +++ b/tests/test-webapps/test-openid-webapp/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,86 @@ + + + + + OPENID + + + + AdminPage + org.eclipse.jetty.test.openid.AdminPage + + + AdminPage + /admin + + + + ErrorPage + org.eclipse.jetty.test.openid.ErrorPage + + + ErrorPage + /error + + + + HomePage + org.eclipse.jetty.test.openid.HomePage + + + HomePage + + + + + LoginPage + org.eclipse.jetty.test.openid.LoginPage + + + LoginPage + /login + + + + LogoutPage + org.eclipse.jetty.test.openid.LogoutPage + + + LogoutPage + /logout + + + + admin + + + ** + + + + + User Pages + /profile + /login + + + ** + + + + + + Admin Page + /admin + + + admin + + + + From e1d149f84c003a2928c9de0ad7030c8124eb12a5 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 8 Feb 2022 15:28:54 +1100 Subject: [PATCH 11/39] Issue #7545 - add name annotations for args in OpenIdConfiguration constructor Signed-off-by: Lachlan Roberts --- .../eclipse/jetty/security/openid/OpenIdConfiguration.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java index cbce1bb634b..df9a82703d4 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java @@ -24,6 +24,7 @@ import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.ajax.JSON; +import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.slf4j.Logger; @@ -86,8 +87,10 @@ public class OpenIdConfiguration extends ContainerLifeCycle * @param authMethod Authentication method to use with the Token Endpoint. * @param httpClient The {@link HttpClient} instance to use. */ - public OpenIdConfiguration(String issuer, String authorizationEndpoint, String tokenEndpoint, - String clientId, String clientSecret, String authMethod, HttpClient httpClient) + public OpenIdConfiguration(@Name("issuer") String issuer, + @Name("authorizationEndpoint") String authorizationEndpoint, @Name("tokenEndpoint") String tokenEndpoint, + @Name("clientId") String clientId, @Name("clientSecret") String clientSecret, + @Name("authMethod") String authMethod, @Name("httpClient") HttpClient httpClient) { this.issuer = issuer; this.clientId = clientId; From 5fe999caa25755dec57d21bc3d694f67de4e45ab Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 8 Feb 2022 15:59:23 +1100 Subject: [PATCH 12/39] Issue #7545 - changes from review Signed-off-by: Lachlan Roberts --- .../jetty/security/openid/OpenIdConfiguration.java | 9 ++++++--- .../java/org/eclipse/jetty/test/openid/AdminPage.java | 2 +- .../java/org/eclipse/jetty/test/openid/ErrorPage.java | 2 +- .../java/org/eclipse/jetty/test/openid/HomePage.java | 2 +- .../java/org/eclipse/jetty/test/openid/LoginPage.java | 2 +- .../java/org/eclipse/jetty/test/openid/LogoutPage.java | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java index df9a82703d4..8ab1255c3fb 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java @@ -88,9 +88,12 @@ public class OpenIdConfiguration extends ContainerLifeCycle * @param httpClient The {@link HttpClient} instance to use. */ public OpenIdConfiguration(@Name("issuer") String issuer, - @Name("authorizationEndpoint") String authorizationEndpoint, @Name("tokenEndpoint") String tokenEndpoint, - @Name("clientId") String clientId, @Name("clientSecret") String clientSecret, - @Name("authMethod") String authMethod, @Name("httpClient") HttpClient httpClient) + @Name("authorizationEndpoint") String authorizationEndpoint, + @Name("tokenEndpoint") String tokenEndpoint, + @Name("clientId") String clientId, + @Name("clientSecret") String clientSecret, + @Name("authMethod") String authMethod, + @Name("httpClient") HttpClient httpClient) { this.issuer = issuer; this.clientId = clientId; diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java index e7f252b6b80..6957b1bb5e7 100644 --- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java @@ -28,4 +28,4 @@ public class AdminPage extends HttpServlet Map userInfo = (Map)request.getSession().getAttribute("org.eclipse.jetty.security.openid.claims"); response.getWriter().println(userInfo.get("sub") + ": success"); } -} \ No newline at end of file +} diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java index c975847ac12..6869e21ce33 100644 --- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java @@ -27,4 +27,4 @@ public class ErrorPage extends HttpServlet response.getWriter().println("not authorized"); response.getWriter().println("
Home"); } -} \ No newline at end of file +} diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java index ca5cca9c048..5ecdb0aedff 100644 --- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java @@ -42,4 +42,4 @@ public class HomePage extends HttpServlet response.getWriter().println("
Login"); } } -} \ No newline at end of file +} diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java index 7f0b351ff11..0abfbb4eab8 100644 --- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java @@ -27,4 +27,4 @@ public class LoginPage extends HttpServlet response.getWriter().println("success"); response.getWriter().println("
Home"); } -} \ No newline at end of file +} diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java index ac79242c24b..13a6c044a6d 100644 --- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java +++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java @@ -26,4 +26,4 @@ public class LogoutPage extends HttpServlet request.getSession().invalidate(); response.sendRedirect(request.getContextPath()); } -} \ No newline at end of file +} From d67fc16a484cc32b5c775d4c0eb453030246049c Mon Sep 17 00:00:00 2001 From: Kaiyue Zhou Date: Tue, 8 Feb 2022 13:01:25 +0800 Subject: [PATCH 13/39] Fix typo: "application/octect-stream" -> "application/octet-stream" --- .../src/main/java/org/eclipse/jetty/client/api/Request.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java index 39e25e542ac..efae0d57a98 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java @@ -279,7 +279,7 @@ public interface Request /** * Shortcut method to specify a file as a content for this request, with the default content type of - * "application/octect-stream". + * "application/octet-stream". * * @param file the file to upload * @return this request object From aca6695e247a8a6ccb941b9fba6aa29db1a394db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Feb 2022 05:07:03 -0600 Subject: [PATCH 14/39] Bump osgi.annotation from 8.0.1 to 8.1.0 (#7552) Bumps [osgi.annotation](https://github.com/osgi/osgi) from 8.0.1 to 8.1.0. - [Release notes](https://github.com/osgi/osgi/releases) - [Commits](https://github.com/osgi/osgi/commits) --- updated-dependencies: - dependency-name: org.osgi:osgi.annotation dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7452dd5a49..45d9310b614 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 3.8.4 3.2.2 0.9.1 - 8.0.1 + 8.1.0 6.0.0 2.1.1 3.4.1 From 9073fe2193b1dbcf3e6427030b392654f1d60a42 Mon Sep 17 00:00:00 2001 From: Jochen Schalanda Date: Wed, 9 Feb 2022 15:48:46 +0100 Subject: [PATCH 15/39] Bump slf4j to 2.0.0-alpha6 (#7555) > SLF4J 2.0.x series requires Java 8. It builds upon the 1.8.x series and adds a backward-compatible fluent logging api. By backward-compatible, we mean that existing logging frameworks do not have to be changed for the user to benefit from the [fluent logging API](https://www.slf4j.org/manual.html#fluent). However, existing frameworks must migrate to the `ServiceLoader` mechanism. The resulting internal changes are [detailed](https://www.slf4j.org/faq.html#changesInVersion200) in the FAQ page. > > - SLF4J now ships with the slf4j-reload4j module delegating to the reload4j backend. Reload4j is a drop-in replacement for log4j version 1.2.17. > - `SimpleLogger` now prints the thread Id if instructed to do so. This fixes [SLF4J-499](https://jira.qos.ch/browse/SLF4J-499) requested by Michael Osipov Signed-off-by: Jochen Schalanda --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45d9310b614..a9f1cb9b1b7 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 6.0.0 2.1.1 3.4.1 - 2.0.0-alpha5 + 2.0.0-alpha6 2.1.1.RELEASE 1.2.5 1.2.5 From 1471b502a77cddc427d2ae434ece820ff7f7bc33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 07:24:08 -0600 Subject: [PATCH 16/39] Bump hawtio-default from 2.14.4 to 2.14.5 (#7559) Bumps [hawtio-default](https://github.com/hawtio/hawtio) from 2.14.4 to 2.14.5. - [Release notes](https://github.com/hawtio/hawtio/releases) - [Changelog](https://github.com/hawtio/hawtio/blob/main/CHANGES.md) - [Commits](https://github.com/hawtio/hawtio/compare/hawtio-2.14.4...hawtio-2.14.5) --- updated-dependencies: - dependency-name: io.hawt:hawtio-default dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a9f1cb9b1b7..7cc01c313a7 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 31.0.1-jre 5.1.0 2.2 - 2.14.4 + 2.14.5 4.2.4 4.3.5.Final 11.0.14.Final From 9602120b9b241f739270e4b07523a3ccfe80bf60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 12:11:00 -0600 Subject: [PATCH 17/39] Bump openwebbeans.version from 2.0.25 to 2.0.26 (#7549) Bumps `openwebbeans.version` from 2.0.25 to 2.0.26. Updates `openwebbeans-web` from 2.0.25 to 2.0.26 - [Release notes](https://github.com/apache/openwebbeans/releases) - [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.25...openwebbeans-2.0.26) Updates `openwebbeans-jetty9` from 2.0.25 to 2.0.26 - [Release notes](https://github.com/apache/openwebbeans/releases) - [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.25...openwebbeans-2.0.26) --- updated-dependencies: - dependency-name: org.apache.openwebbeans:openwebbeans-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.openwebbeans:openwebbeans-jetty9 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/test-webapps/test-owb-cdi-webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 0e36f899432..c58a0ac73e3 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -13,7 +13,7 @@ ${project.groupId}.cdi.owb - 2.0.25 + 2.0.26 From ff0b596ca7d8e29df324b9e9dc95bdffb961ca12 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 11 Feb 2022 09:16:26 +1100 Subject: [PATCH 18/39] Issue #7513 Move jmx annotation to PropertiesConfigurationManager.getFile (#7532) Signed-off-by: Jan Bartel --- .../eclipse/jetty/deploy/PropertiesConfigurationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/PropertiesConfigurationManager.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/PropertiesConfigurationManager.java index 77b957a99eb..667a2424068 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/PropertiesConfigurationManager.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/PropertiesConfigurationManager.java @@ -57,7 +57,6 @@ public class PropertiesConfigurationManager implements ConfigurationManager, Dum this(null); } - @ManagedAttribute("A file or URL of properties") public void setFile(String resource) throws IOException { _properties = resource; @@ -65,6 +64,7 @@ public class PropertiesConfigurationManager implements ConfigurationManager, Dum loadProperties(_properties); } + @ManagedAttribute("A file or URL of properties") public String getFile() { return _properties; From 3a98712a6215d88ad57c6c6affecd1f88ef20cbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 10:35:01 +0000 Subject: [PATCH 19/39] Bump maven-javadoc-plugin from 3.3.1 to 3.3.2 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.1...maven-javadoc-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build-resources/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 4264abba890..b1d443a0156 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -15,7 +15,7 @@ UTF-8 3.0.0-M2 - 3.3.1 + 3.3.2 1.6.0 3.0.0-M5 diff --git a/pom.xml b/pom.xml index 7cc01c313a7..5ba922106c2 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 3.0.0-M1 3.2.2 3.2.2 - 3.3.1 + 3.3.2 3.1.1 3.6.4 3.6.4 From b99984d12d71bcd8c852e439dbcb90ef18104b8a Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 11 Feb 2022 14:56:38 -0600 Subject: [PATCH 20/39] Fixing Jetty 10 release - must use Java 17 (#7556) * Fixing missing `jdk.incubator.foreign` error during /javadoc/ (aggregate module) build. * eclipse-release profile now ensures that JDK 17 is used * Exclude quiche modules from javadoc * Enable jacoco on JDK 17 (seems to work now) * Flip JDK importance around (JDK17 first, JDK11 next) * errorprone not available on JDK17 (yet) * correcting errors during Jenkinsfile recordIssues * Remove pmd (not being used anymore) * Bump javadoc from 3.3.1 to 3.3.2 --- Jenkinsfile | 12 ++++++------ javadoc/pom.xml | 7 ++++--- pom.xml | 7 +++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a3ae5133ae3..a8c14a84e1b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,12 +7,12 @@ pipeline { stages { stage("Parallel Stage") { parallel { - stage("Build / Test - JDK11") { + stage("Build / Test - JDK17") { agent { node { label 'linux' } } steps { container('jetty-build') { timeout( time: 120, unit: 'MINUTES' ) { - mavenBuild( "jdk11", "clean install -Perrorprone", "maven3") + mavenBuild( "jdk17", "clean install", "maven3") // Collect up the jacoco execution results (only on main build) jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class', exclusionPattern: '' + @@ -31,19 +31,19 @@ pipeline { execPattern: '**/target/jacoco.exec', classPattern: '**/target/classes', sourcePattern: '**/src/main/java' - recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser(), errorProne()] + recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle()] } } } } - stage("Build / Test - JDK17") { + stage("Build / Test - JDK11") { agent { node { label 'linux' } } steps { container( 'jetty-build' ) { timeout( time: 120, unit: 'MINUTES' ) { - mavenBuild( "jdk17", "clean install -Dspotbugs.skip=true -Djacoco.skip=true", "maven3") - recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser()] + mavenBuild( "jdk11", "clean install -Dspotbugs.skip=true -Djacoco.skip=true -Perrorprone", "maven3") + recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), errorProne()] } } } diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 8d9ea4a9891..f1ee1b1d02a 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -14,7 +14,6 @@ ${project.build.directory}/jetty-sources true - true true true @@ -109,6 +108,10 @@ infinispan-remote, jetty-test-helper, alpn-api, + quic-quiche, + quic-quiche-common, + quic-quiche-foreign-incubator, + quic-quiche-jna, javax.servlet, javax.websocket, jetty-servlet-api, @@ -148,8 +151,6 @@ org.eclipse.jetty.http3.qpack.internal.*; org.eclipse.jetty.http3.server.internal; org.eclipse.jetty.quic.common.internal; - org.eclipse.jetty.quic.quiche; - org.eclipse.jetty.quic.quiche.*; org.eclipse.jetty.quic.server.internal; diff --git a/pom.xml b/pom.xml index 7cc01c313a7..ac43330a614 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 3.0.0-M1 3.2.2 3.2.2 - 3.3.1 + 3.3.2 3.1.1 3.6.4 3.6.4 @@ -2237,8 +2237,8 @@ - [11,) - [ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 11 or newer + [17,) + [ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 17 or newer @@ -2353,7 +2353,6 @@ true - true From 65a47a369d3f6e56ecb9d55fb052cfab7c0540a9 Mon Sep 17 00:00:00 2001 From: Ning Sun Date: Sun, 13 Feb 2022 21:12:52 +0800 Subject: [PATCH 21/39] Turn off mutual TLS for quic-server by default Signed-off-by: Ning Sun --- .../java/org/eclipse/jetty/quic/server/QuicServerConnector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/QuicServerConnector.java b/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/QuicServerConnector.java index a134dcd1b74..a2d3c1ffe5d 100644 --- a/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/QuicServerConnector.java +++ b/jetty-quic/quic-server/src/main/java/org/eclipse/jetty/quic/server/QuicServerConnector.java @@ -89,7 +89,7 @@ public class QuicServerConnector extends AbstractNetworkConnector // One bidirectional stream to simulate the TCP stream, and no unidirectional streams. quicConfiguration.setMaxBidirectionalRemoteStreams(1); quicConfiguration.setMaxUnidirectionalRemoteStreams(0); - quicConfiguration.setVerifyPeerCertificates(true); + quicConfiguration.setVerifyPeerCertificates(false); } public QuicConfiguration getQuicConfiguration() From 0aa307db64f3f864bb9391f78606d9fbac3a3917 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 14 Feb 2022 12:13:14 +1100 Subject: [PATCH 22/39] Issue #7567 - don't compare params when checking MIME type for GzipHandler Signed-off-by: Lachlan Roberts --- .../server/handler/gzip/GzipHandler.java | 2 +- .../gzip/GzipHttpOutputInterceptor.java | 5 +- .../jetty/servlet/MultiPartServletTest.java | 85 +++++++++++++++++-- 3 files changed, 83 insertions(+), 9 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java index be3ade5225c..1a739fe9729 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java @@ -694,7 +694,7 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory String mimeType = context == null ? MimeTypes.getDefaultMimeByExtension(path) : context.getMimeType(path); if (mimeType != null) { - mimeType = MimeTypes.getContentTypeWithoutCharset(mimeType); + mimeType = HttpField.valueParameters(mimeType, null); if (!isMimeTypeGzipable(mimeType)) { LOG.debug("{} excluded by path suffix mime type {}", this, request); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java index 996638f9fea..835622b2464 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java @@ -23,7 +23,6 @@ import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.http.PreEncodedHttpField; import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.HttpOutput; @@ -160,8 +159,8 @@ public class GzipHttpOutputInterceptor implements HttpOutput.Interceptor String ct = response.getContentType(); if (ct != null) { - ct = MimeTypes.getContentTypeWithoutCharset(ct); - if (!_factory.isMimeTypeGzipable(StringUtil.asciiToLowerCase(ct))) + String baseType = HttpField.valueParameters(ct, null); + if (!_factory.isMimeTypeGzipable(StringUtil.asciiToLowerCase(baseType))) { LOG.debug("{} exclude by mimeType {}", this, ct); noCompression(); diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java index 97070176a57..9568a784cba 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/MultiPartServletTest.java @@ -14,9 +14,14 @@ package org.eclipse.jetty.servlet; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.zip.GZIPInputStream; import javax.servlet.MultipartConfigElement; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -26,8 +31,13 @@ import javax.servlet.http.Part; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.ContentResponse; +import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.util.BytesRequestContent; +import org.eclipse.jetty.client.util.InputStreamResponseListener; import org.eclipse.jetty.client.util.MultiPartRequestContent; +import org.eclipse.jetty.client.util.StringRequestContent; +import org.eclipse.jetty.http.HttpFields; +import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.http.MimeTypes; @@ -36,6 +46,7 @@ import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.MultiPartFormInputStream; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.handler.gzip.GzipHandler; import org.eclipse.jetty.util.IO; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -44,7 +55,9 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.startsWith; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class MultiPartServletTest { @@ -77,29 +90,53 @@ public class MultiPartServletTest } } + public static class MultiPartEchoServlet extends HttpServlet + { + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + if (!req.getContentType().contains(MimeTypes.Type.MULTIPART_FORM_DATA.asString())) + { + resp.sendError(400); + return; + } + + resp.setContentType(req.getContentType()); + IO.copy(req.getInputStream(), resp.getOutputStream()); + } + } + @BeforeEach public void start() throws Exception { tmpDir = Files.createTempDirectory(MultiPartServletTest.class.getSimpleName()); + assertNotNull(tmpDir); server = new Server(); connector = new ServerConnector(server); server.addConnector(connector); + MultipartConfigElement config = new MultipartConfigElement(tmpDir.toAbsolutePath().toString(), + MAX_FILE_SIZE, -1, 1); + ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS); contextHandler.setContextPath("/"); ServletHolder servletHolder = contextHandler.addServlet(MultiPartServlet.class, "/"); - - MultipartConfigElement config = new MultipartConfigElement(tmpDir.toAbsolutePath().toString(), - MAX_FILE_SIZE, -1, 1); + servletHolder.getRegistration().setMultipartConfig(config); + servletHolder = contextHandler.addServlet(MultiPartEchoServlet.class, "/echo"); servletHolder.getRegistration().setMultipartConfig(config); - server.setHandler(contextHandler); + GzipHandler gzipHandler = new GzipHandler(); + gzipHandler.addIncludedMimeTypes("multipart/form-data"); + gzipHandler.setMinGzipSize(32); + gzipHandler.setHandler(contextHandler); + server.setHandler(gzipHandler); server.start(); client = new HttpClient(); client.start(); + client.getContentDecoderFactories().clear(); } @AfterEach @@ -135,6 +172,44 @@ public class MultiPartServletTest containsString("Multipart Mime part largePart exceeds max filesize")); } - assertThat(tmpDir.toFile().list().length, is(0)); + String[] fileList = tmpDir.toFile().list(); + assertNotNull(fileList); + assertThat(fileList.length, is(0)); + } + + @Test + public void testMultiPartGzip() throws Exception + { + String contentString = "the quick brown fox jumps over the lazy dog, " + + "the quick brown fox jumps over the lazy dog"; + StringRequestContent content = new StringRequestContent(contentString); + + MultiPartRequestContent multiPart = new MultiPartRequestContent(); + multiPart.addFieldPart("largePart", content, null); + multiPart.close(); + + try (StacklessLogging ignored = new StacklessLogging(HttpChannel.class, MultiPartFormInputStream.class)) + { + InputStreamResponseListener responseStream = new InputStreamResponseListener(); + client.newRequest("localhost", connector.getLocalPort()) + .path("/echo") + .scheme(HttpScheme.HTTP.asString()) + .method(HttpMethod.POST) + .headers(h -> h.add(HttpHeader.ACCEPT_ENCODING, "gzip")) + .body(multiPart) + .send(responseStream); + + Response response = responseStream.get(5, TimeUnit.SECONDS); + HttpFields headers = response.getHeaders(); + assertThat(headers.get(HttpHeader.CONTENT_TYPE), startsWith("multipart/form-data")); + assertThat(headers.get(HttpHeader.CONTENT_ENCODING), is("gzip")); + + InputStream inputStream = new GZIPInputStream(responseStream.getInputStream()); + String contentType = headers.get(HttpHeader.CONTENT_TYPE); + MultiPartFormInputStream mpis = new MultiPartFormInputStream(inputStream, contentType, null, null); + List parts = new ArrayList<>(mpis.getParts()); + assertThat(parts.size(), is(1)); + assertThat(IO.toString(parts.get(0).getInputStream()), is(contentString)); + } } } From 21ec2f072fbe5c74d140f0a7e0d7b7923c2b7961 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 14 Feb 2022 12:23:55 +1100 Subject: [PATCH 23/39] Issue #7567 - don't need to convert to lowercase with a AsciiLowerCaseSet Signed-off-by: Lachlan Roberts --- .../jetty/server/handler/gzip/GzipHttpOutputInterceptor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java index 835622b2464..95cc2bf206d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java @@ -30,7 +30,6 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IteratingNestedCallback; -import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.compression.DeflaterPool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -160,7 +159,7 @@ public class GzipHttpOutputInterceptor implements HttpOutput.Interceptor if (ct != null) { String baseType = HttpField.valueParameters(ct, null); - if (!_factory.isMimeTypeGzipable(StringUtil.asciiToLowerCase(baseType))) + if (!_factory.isMimeTypeGzipable(baseType)) { LOG.debug("{} exclude by mimeType {}", this, ct); noCompression(); From 7081a776b7dc410ff9336d3cfa25aaa98fa044ff Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 14 Feb 2022 16:37:57 +1100 Subject: [PATCH 24/39] Issue #7573 - fix support in websocket for class path param types Signed-off-by: Lachlan Roberts --- .../JavaxWebSocketFrameHandlerFactory.java | 38 +++++------ .../server/internal/PathParamIdentifier.java | 8 +++ .../websocket/javax/tests/PathParamTest.java | 66 +++++++++++++++++++ .../tests/pathparam/BooleanClassSocket.java | 30 +++++++++ .../tests/pathparam/BooleanTypeSocket.java | 30 +++++++++ .../tests/pathparam/ByteClassSocket.java | 30 +++++++++ .../javax/tests/pathparam/ByteTypeSocket.java | 30 +++++++++ .../tests/pathparam/CharacterClassSocket.java | 30 +++++++++ .../tests/pathparam/CharacterTypeSocket.java | 30 +++++++++ .../tests/pathparam/DoubleClassSocket.java | 30 +++++++++ .../tests/pathparam/DoubleTypeSocket.java | 30 +++++++++ .../tests/pathparam/FloatClassSocket.java | 30 +++++++++ .../tests/pathparam/FloatTypeSocket.java | 30 +++++++++ .../tests/pathparam/IntegerClassSocket.java | 30 +++++++++ .../tests/pathparam/IntegerTypeSocket.java | 30 +++++++++ .../tests/pathparam/LongClassSocket.java | 30 +++++++++ .../javax/tests/pathparam/LongTypeSocket.java | 30 +++++++++ .../tests/pathparam/ShortClassSocket.java | 30 +++++++++ .../tests/pathparam/ShortTypeSocket.java | 30 +++++++++ .../tests/pathparam/StringClassSocket.java | 30 +++++++++ 20 files changed, 601 insertions(+), 21 deletions(-) create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/BooleanClassSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/BooleanTypeSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ByteClassSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ByteTypeSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/CharacterClassSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/CharacterTypeSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/DoubleClassSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/DoubleTypeSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/FloatClassSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/FloatTypeSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/IntegerClassSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/IntegerTypeSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/LongClassSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/LongTypeSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ShortClassSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ShortTypeSocket.java create mode 100644 jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/StringClassSocket.java diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java index 3910e04bce3..53ba19bf05a 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java @@ -54,8 +54,6 @@ import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMess import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink; -import static java.nio.charset.StandardCharsets.UTF_8; - public abstract class JavaxWebSocketFrameHandlerFactory { private static final MethodHandle FILTER_RETURN_TYPE_METHOD; @@ -536,49 +534,47 @@ public abstract class JavaxWebSocketFrameHandlerFactory { retHandle = MethodHandles.insertArguments(retHandle, IDX, strValue); } - else if (Integer.TYPE.isAssignableFrom(type)) + else if (Integer.class.isAssignableFrom(type) || Integer.TYPE.isAssignableFrom(type)) { - int intValue = Integer.parseInt(strValue); + Integer intValue = Integer.parseInt(strValue); retHandle = MethodHandles.insertArguments(retHandle, IDX, intValue); } - else if (Long.TYPE.isAssignableFrom(type)) + else if (Long.class.isAssignableFrom(type) || Long.TYPE.isAssignableFrom(type)) { - long longValue = Long.parseLong(strValue); + Long longValue = Long.parseLong(strValue); retHandle = MethodHandles.insertArguments(retHandle, IDX, longValue); } - else if (Short.TYPE.isAssignableFrom(type)) + else if (Short.class.isAssignableFrom(type) || Short.TYPE.isAssignableFrom(type)) { - short shortValue = Short.parseShort(strValue); + Short shortValue = Short.parseShort(strValue); retHandle = MethodHandles.insertArguments(retHandle, IDX, shortValue); } - else if (Float.TYPE.isAssignableFrom(type)) + else if (Float.class.isAssignableFrom(type) || Float.TYPE.isAssignableFrom(type)) { - float floatValue = Float.parseFloat(strValue); + Float floatValue = Float.parseFloat(strValue); retHandle = MethodHandles.insertArguments(retHandle, IDX, floatValue); } - else if (Double.TYPE.isAssignableFrom(type)) + else if (Double.class.isAssignableFrom(type) || Double.TYPE.isAssignableFrom(type)) { - double doubleValue = Double.parseDouble(strValue); + Double doubleValue = Double.parseDouble(strValue); retHandle = MethodHandles.insertArguments(retHandle, IDX, doubleValue); } - else if (Boolean.TYPE.isAssignableFrom(type)) + else if (Boolean.class.isAssignableFrom(type) || Boolean.TYPE.isAssignableFrom(type)) { - boolean boolValue = Boolean.parseBoolean(strValue); + Boolean boolValue = Boolean.parseBoolean(strValue); retHandle = MethodHandles.insertArguments(retHandle, IDX, boolValue); } - else if (Character.TYPE.isAssignableFrom(type)) + else if (Character.class.isAssignableFrom(type) || Character.TYPE.isAssignableFrom(type)) { if (strValue.length() != 1) throw new IllegalArgumentException("Invalid Size"); - char charValue = strValue.charAt(0); + Character charValue = strValue.charAt(0); retHandle = MethodHandles.insertArguments(retHandle, IDX, charValue); } - else if (Byte.TYPE.isAssignableFrom(type)) + else if (Byte.class.isAssignableFrom(type) || Byte.TYPE.isAssignableFrom(type)) { - byte[] buf = strValue.getBytes(UTF_8); - if (buf.length != 1) - throw new IllegalArgumentException("Invalid Size"); - retHandle = MethodHandles.insertArguments(retHandle, IDX, buf[0]); + Byte b = Byte.parseByte(strValue); + retHandle = MethodHandles.insertArguments(retHandle, IDX, b); } else { diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java index 72424f90e19..bac060f3224 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java +++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java @@ -52,13 +52,21 @@ public class PathParamIdentifier implements InvokerUtils.ParamIdentifier public static void validateType(Class type) { if (!String.class.isAssignableFrom(type) && + !Integer.class.isAssignableFrom(type) && !Integer.TYPE.isAssignableFrom(type) && + !Long.class.isAssignableFrom(type) && !Long.TYPE.isAssignableFrom(type) && + !Short.class.isAssignableFrom(type) && !Short.TYPE.isAssignableFrom(type) && + !Float.class.isAssignableFrom(type) && !Float.TYPE.isAssignableFrom(type) && + !Double.class.isAssignableFrom(type) && !Double.TYPE.isAssignableFrom(type) && + !Boolean.class.isAssignableFrom(type) && !Boolean.TYPE.isAssignableFrom(type) && + !Character.class.isAssignableFrom(type) && !Character.TYPE.isAssignableFrom(type) && + !Byte.class.isAssignableFrom(type) && !Byte.TYPE.isAssignableFrom(type)) throw new InvalidSignatureException("Unsupported PathParam Type: " + type); } diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java index 49c078ca0e1..394c8c4369c 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java @@ -15,6 +15,7 @@ package org.eclipse.jetty.websocket.javax.tests; import java.net.URI; import java.util.concurrent.TimeUnit; +import java.util.stream.Stream; import javax.websocket.ContainerProvider; import javax.websocket.OnMessage; import javax.websocket.OnOpen; @@ -27,12 +28,35 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer; +import org.eclipse.jetty.websocket.javax.tests.pathparam.BooleanClassSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.BooleanTypeSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.ByteClassSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.ByteTypeSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.CharacterClassSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.CharacterTypeSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.DoubleClassSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.DoubleTypeSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.FloatClassSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.FloatTypeSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.IntegerClassSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.IntegerTypeSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.LongClassSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.LongTypeSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.ShortClassSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.ShortTypeSocket; +import org.eclipse.jetty.websocket.javax.tests.pathparam.StringClassSocket; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PathParamTest { @@ -81,6 +105,48 @@ public class PathParamTest } } + public static Stream pathParamEndpoints() + { + return Stream.of( + Arguments.of(BooleanClassSocket.class, "false"), + Arguments.of(BooleanTypeSocket.class, "true"), + Arguments.of(ByteClassSocket.class, "32"), + Arguments.of(ByteTypeSocket.class, "51"), + Arguments.of(CharacterClassSocket.class, "q"), + Arguments.of(CharacterTypeSocket.class, "&"), + Arguments.of(DoubleClassSocket.class, Double.toString(Double.MAX_VALUE)), + Arguments.of(DoubleTypeSocket.class, Double.toString(Double.MIN_VALUE)), + Arguments.of(FloatClassSocket.class, "0.00235"), + Arguments.of(FloatTypeSocket.class, "123.456"), + Arguments.of(IntegerClassSocket.class, Integer.toString(Integer.MIN_VALUE)), + Arguments.of(IntegerTypeSocket.class, Integer.toString(Integer.MAX_VALUE)), + Arguments.of(LongClassSocket.class, Long.toString(Long.MAX_VALUE)), + Arguments.of(LongTypeSocket.class, Long.toString(Long.MIN_VALUE)), + Arguments.of(ShortClassSocket.class, Short.toString(Short.MAX_VALUE)), + Arguments.of(ShortTypeSocket.class, Short.toString(Short.MIN_VALUE)), + Arguments.of(StringClassSocket.class, "this_is_a_String_ID") + ); + } + + @ParameterizedTest + @MethodSource("pathParamEndpoints") + public void testPathParamSignatures(Class endpointClass, String id) throws Exception + { + JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer(_context.getServletContext()); + assertNotNull(serverContainer); + serverContainer.addEndpoint(endpointClass); + + WebSocketContainer container = ContainerProvider.getWebSocketContainer(); + EventSocket clientEndpoint = new EventSocket(); + + URI serverUri = URI.create("ws://localhost:" + _connector.getLocalPort() + "/context/pathParam/id/" + id); + container.connectToServer(clientEndpoint, serverUri); + + assertTrue(clientEndpoint.closeLatch.await(5, TimeUnit.SECONDS)); + String resp = clientEndpoint.textMessages.poll(1, TimeUnit.SECONDS); + assertThat(resp, is("id: " + id)); + } + @Test public void testBasicPathParamSocket() throws Exception { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/BooleanClassSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/BooleanClassSocket.java new file mode 100644 index 00000000000..f414401c6d2 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/BooleanClassSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class BooleanClassSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") Boolean id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/BooleanTypeSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/BooleanTypeSocket.java new file mode 100644 index 00000000000..e211383f133 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/BooleanTypeSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class BooleanTypeSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") boolean id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ByteClassSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ByteClassSocket.java new file mode 100644 index 00000000000..9608e0d56ef --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ByteClassSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class ByteClassSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") Byte id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ByteTypeSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ByteTypeSocket.java new file mode 100644 index 00000000000..5c197f87631 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ByteTypeSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class ByteTypeSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") byte id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/CharacterClassSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/CharacterClassSocket.java new file mode 100644 index 00000000000..d22f058915f --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/CharacterClassSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class CharacterClassSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") Character id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/CharacterTypeSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/CharacterTypeSocket.java new file mode 100644 index 00000000000..e03191316af --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/CharacterTypeSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class CharacterTypeSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") char id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/DoubleClassSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/DoubleClassSocket.java new file mode 100644 index 00000000000..60f47756361 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/DoubleClassSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class DoubleClassSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") Double id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/DoubleTypeSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/DoubleTypeSocket.java new file mode 100644 index 00000000000..5a64664000e --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/DoubleTypeSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class DoubleTypeSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") double id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/FloatClassSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/FloatClassSocket.java new file mode 100644 index 00000000000..b59fc4c0b67 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/FloatClassSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class FloatClassSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") Float id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/FloatTypeSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/FloatTypeSocket.java new file mode 100644 index 00000000000..6e8b290aacd --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/FloatTypeSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class FloatTypeSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") float id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/IntegerClassSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/IntegerClassSocket.java new file mode 100644 index 00000000000..9a750baa2d7 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/IntegerClassSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class IntegerClassSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") Integer id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/IntegerTypeSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/IntegerTypeSocket.java new file mode 100644 index 00000000000..4b15e24ee91 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/IntegerTypeSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class IntegerTypeSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") int id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/LongClassSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/LongClassSocket.java new file mode 100644 index 00000000000..cbf270915e8 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/LongClassSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class LongClassSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") Long id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/LongTypeSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/LongTypeSocket.java new file mode 100644 index 00000000000..25a8c2dab06 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/LongTypeSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class LongTypeSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") long id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ShortClassSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ShortClassSocket.java new file mode 100644 index 00000000000..0f88eb6b60a --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ShortClassSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class ShortClassSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") Short id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ShortTypeSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ShortTypeSocket.java new file mode 100644 index 00000000000..32747d91b27 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/ShortTypeSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class ShortTypeSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") short id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/StringClassSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/StringClassSocket.java new file mode 100644 index 00000000000..a52616b9161 --- /dev/null +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/pathparam/StringClassSocket.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.websocket.javax.tests.pathparam; + +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; + +@ServerEndpoint("/pathParam/id/{id}") +public class StringClassSocket +{ + @OnOpen + public void onOpen(Session session, @PathParam("id") String id) throws Exception + { + session.getBasicRemote().sendText("id: " + id); + session.close(); + } +} From 0f1dcfe23317486334ba8101cef8988180f89273 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 08:56:07 +0000 Subject: [PATCH 25/39] Bump maven-compiler-plugin from 3.8.1 to 3.10.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.1 to 3.10.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.1...maven-compiler-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac43330a614..841c1d3806e 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ 5.1.4 3.1.0 3.1.2 - 3.8.1 + 3.10.0 3.2.0 3.0.0-M2 2.10 From 4382bc122ef78dede98174a679bb15a34bd4ece1 Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Wed, 2 Feb 2022 11:10:09 +0100 Subject: [PATCH 26/39] #7461 Use less strict assertion for expiring pool to account for potential expirations Signed-off-by: Ludovic Orban --- .../java/org/eclipse/jetty/client/ConnectionPoolTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java index ccecb188b96..257c810cdc6 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java @@ -54,6 +54,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -316,7 +318,10 @@ public class ConnectionPoolTest assertEquals(1, destinations.size()); HttpDestination destination = (HttpDestination)destinations.get(0); AbstractConnectionPool connectionPool = (AbstractConnectionPool)destination.getConnectionPool(); - assertEquals(2, connectionPool.getConnectionCount()); + if (DUPLEX_MAX_DURATION == factory) + assertThat(connectionPool.getConnectionCount(), lessThanOrEqualTo(2)); // The connections can expire upon release. + else + assertThat(connectionPool.getConnectionCount(), is(2)); } @ParameterizedTest From a6cd037923cf853985d22772ff3bdc935724c5b0 Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Fri, 11 Feb 2022 12:14:37 +0100 Subject: [PATCH 27/39] #7461 Adapt other tests to use less strict assertion for expiring pool Signed-off-by: Ludovic Orban --- .../jetty/client/ConnectionPoolTest.java | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java index 257c810cdc6..31838e0eb7a 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolTest.java @@ -77,11 +77,6 @@ public class ConnectionPoolTest return Stream.of(DUPLEX, MULTIPLEX, RANDOM, DUPLEX_MAX_DURATION, ROUND_ROBIN); } - public static Stream poolsNoMaxDuration() - { - return Stream.of(DUPLEX, MULTIPLEX, RANDOM, ROUND_ROBIN); - } - public static Stream poolsNoRoundRobin() { return Stream.of(DUPLEX, MULTIPLEX, RANDOM, DUPLEX_MAX_DURATION); @@ -381,8 +376,7 @@ public class ConnectionPoolTest } @ParameterizedTest - // Connection pool aggressively closes expired connections upon release, which interferes with this test's assertion. - @MethodSource("poolsNoMaxDuration") + @MethodSource("pools") public void testConcurrentRequestsAllBlockedOnServerWithLargeConnectionPool(ConnectionPoolFactory factory) throws Exception { int count = 50; @@ -390,8 +384,7 @@ public class ConnectionPoolTest } @ParameterizedTest - // Connection pool aggressively closes expired connections upon release, which interferes with this test's assertion. - @MethodSource("poolsNoMaxDuration") + @MethodSource("pools") public void testConcurrentRequestsAllBlockedOnServerWithExactConnectionPool(ConnectionPoolFactory factory) throws Exception { int count = 50; @@ -454,9 +447,13 @@ public class ConnectionPoolTest assertTrue(latch.await(5, TimeUnit.SECONDS), "server requests " + barrier.getNumberWaiting() + "<" + count + " - client: " + client.dump()); List destinations = client.getDestinations(); assertEquals(1, destinations.size()); - HttpDestination destination = (HttpDestination)destinations.get(0); - AbstractConnectionPool connectionPool = (AbstractConnectionPool)destination.getConnectionPool(); - assertThat(connectionPool.getConnectionCount(), Matchers.greaterThanOrEqualTo(count)); + // The max duration connection pool aggressively closes expired connections upon release, which interferes with this assertion. + if (DUPLEX_MAX_DURATION != factory) + { + HttpDestination destination = (HttpDestination)destinations.get(0); + AbstractConnectionPool connectionPool = (AbstractConnectionPool)destination.getConnectionPool(); + assertThat(connectionPool.getConnectionCount(), Matchers.greaterThanOrEqualTo(count)); + } } @Test @@ -593,8 +590,17 @@ public class ConnectionPoolTest AbstractConnectionPool connectionPool = (AbstractConnectionPool)destination.getConnectionPool(); assertEquals(0, connectionPool.getActiveConnectionCount()); - assertEquals(1, connectionPool.getIdleConnectionCount()); - assertEquals(1, connectionPool.getConnectionCount()); + if (DUPLEX_MAX_DURATION == factory) + { + // The connections can expire upon release. + assertThat(connectionPool.getIdleConnectionCount(), lessThanOrEqualTo(1)); + assertThat(connectionPool.getConnectionCount(), lessThanOrEqualTo(1)); + } + else + { + assertThat(connectionPool.getIdleConnectionCount(), is(1)); + assertThat(connectionPool.getConnectionCount(), is(1)); + } // Send second request, max usage count will be reached, // the only connection must be closed. @@ -630,7 +636,10 @@ public class ConnectionPoolTest // Trigger the creation of a destination, that will create the connection pool. HttpDestination destination = client.resolveDestination(new Origin("http", "localhost", connector.getLocalPort())); AbstractConnectionPool connectionPool = (AbstractConnectionPool)destination.getConnectionPool(); - assertEquals(1, connectionPool.getConnectionCount()); + if (DUPLEX_MAX_DURATION == factory) + assertThat(connectionPool.getConnectionCount(), lessThanOrEqualTo(1)); // The connections can expire upon release. + else + assertThat(connectionPool.getConnectionCount(), is(1)); // Wait for the pre-created connections to idle timeout. Thread.sleep(idleTimeout + idleTimeout / 2); From 026be2904ff693fcd613b1cb97fff3fbd35d942d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 07:26:33 -0600 Subject: [PATCH 28/39] Bump logback-core from 1.3.0-alpha13 to 1.3.0-alpha14 (#7585) Bumps [logback-core](https://github.com/qos-ch/logback) from 1.3.0-alpha13 to 1.3.0-alpha14. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](https://github.com/qos-ch/logback/compare/v_1.3.0-alpha13...v_1.3.0-alpha14) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac43330a614..427ca342842 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 5.8.2 2.0.1 2.17.1 - 1.3.0-alpha13 + 1.3.0-alpha14 3.0.3 10.3.6 0.13.1 From 1f665df227813a3c6c49bfdb42b35751f3952634 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 07:27:09 -0600 Subject: [PATCH 29/39] Bump json-smart from 2.4.7 to 2.4.8 (#7581) Bumps [json-smart](https://github.com/netplex/json-smart-v2) from 2.4.7 to 2.4.8. - [Release notes](https://github.com/netplex/json-smart-v2/releases) - [Commits](https://github.com/netplex/json-smart-v2/commits/2.4.8) --- updated-dependencies: - dependency-name: net.minidev:json-smart dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 427ca342842..9d25ca63d10 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 0.38.17 1.3.3 1.1.1 - 2.4.7 + 2.4.8 9.0.52 5.8.2 2.0.1 From f2550d44783cac0fe709556f21f0a48d43c18639 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 07:34:24 -0600 Subject: [PATCH 30/39] Bump gson from 2.8.9 to 2.9.0 (#7587) Bumps [gson](https://github.com/google/gson) from 2.8.9 to 2.9.0. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.9...gson-parent-2.9.0) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d25ca63d10..91c52f064d8 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 3.0.2 2.11.0 1.44.0 - 2.8.9 + 2.9.0 31.0.1-jre 5.1.0 2.2 From 9b4806079494d3ead01017d25d67fd3a8fe5daa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 07:45:34 -0600 Subject: [PATCH 31/39] Bump infinispan-bom from 11.0.14.Final to 11.0.15.Final (#7591) Bumps [infinispan-bom](https://github.com/infinispan/infinispan) from 11.0.14.Final to 11.0.15.Final. - [Release notes](https://github.com/infinispan/infinispan/releases) - [Changelog](https://github.com/infinispan/infinispan/blob/main/Jenkinsfile-release) - [Commits](https://github.com/infinispan/infinispan/compare/11.0.14.Final...11.0.15.Final) --- updated-dependencies: - dependency-name: org.infinispan:infinispan-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91c52f064d8..42b6130041d 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 2.14.5 4.2.4 4.3.5.Final - 11.0.14.Final + 11.0.15.Final 2.13.1 2.13.1 2.13.1 From d4f453849c86388288d3149bb1f14cd030cef469 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 09:18:38 +0000 Subject: [PATCH 32/39] Bump weld-servlet-core from 3.1.8.Final to 3.1.9.Final Bumps weld-servlet-core from 3.1.8.Final to 3.1.9.Final. --- updated-dependencies: - dependency-name: org.jboss.weld.servlet:weld-servlet-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52dd89bbe77..30ca51d4e22 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 1.2.5 1.2.5 1.16.3 - 3.1.8.Final + 3.1.9.Final 1.5.4.Final 1.18.3.Final 2.4.7 From 292d6cda9f4377aaa021607dbc7da54aec23e9c8 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Feb 2022 04:54:30 -0600 Subject: [PATCH 33/39] Issue #7572 - make legit test exception less noisy (#7596) --- .../java/org/eclipse/jetty/server/ConnectorTimeoutTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java index 0bb5904eaea..b6704fb9436 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java @@ -25,6 +25,7 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.Exchanger; import java.util.concurrent.TimeUnit; +import javax.net.ssl.SSLHandshakeException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -535,6 +536,10 @@ public abstract class ConnectorTimeoutTest extends HttpServerTestFixture assertThat(response, is("")); assertEquals(-1, is.read()); } + catch (SSLHandshakeException e) + { + LOG.debug("Legit possible SSL result", e); + } catch (IOException e) { LOG.warn("Unable to read stream", e); From f2e96804317131972cf6641e4ce82bd6c4e55c45 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Feb 2022 11:34:30 -0600 Subject: [PATCH 34/39] Honor parameters order when parsing query and form parameters (#7599) (#7605) * Honor parameters order when parsing query and form parameters When parsing the query or form parameters in Request, the values are stored in a MultiMap. This class extends HashMap which does not preserve the order of insertion so a request with parameters "first=1&second=2" might end up in a map where "second" will come first when iterating on the entry set. The order is necessary in some case where the request is signed off the body and/or the query parameters. When the order is not preserved, it is impossible to reconstruct the original request sent, unless using the Request::getInputStream which consumes the stream and makes subsequent calls to Request::getParameters to don't return the form parameters which can be misleading. The same behavior applied to query parameters, by using Request::getQueryString, you get the correct order but Request::getParameters will not. Moreoever, if the application is behind a reverse proxy using Jetty that is proxying using Request::getParameters which consume the request InputStream, it will be completely impossible to reconstruct the original request. * Added a test with parameter merging Co-authored-by: Jacques-Etienne Beaudet --- .../org/eclipse/jetty/server/RequestTest.java | 59 +++++++++++++++++++ .../java/org/eclipse/jetty/util/MultiMap.java | 10 ++-- 2 files changed, 64 insertions(+), 5 deletions(-) diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java index 21a41ea964a..73269c2d738 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java @@ -34,6 +34,7 @@ import java.util.EnumSet; import java.util.Enumeration; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; @@ -253,6 +254,64 @@ public class RequestTest assertTrue(responses.startsWith("HTTP/1.1 200")); } + @Test + public void testParameterExtractionKeepOrderingIntact() throws Exception + { + AtomicReference> reference = new AtomicReference<>(); + _handler._checker = new RequestTester() + { + @Override + public boolean check(HttpServletRequest request, HttpServletResponse response) + { + reference.set(request.getParameterMap()); + return true; + } + }; + + String request = "POST /?first=1&second=2&third=3&fourth=4 HTTP/1.1\r\n" + + "Host: whatever\r\n" + + "Content-Type: application/x-www-form-urlencoded\n" + + "Connection: close\n" + + "Content-Length: 34\n" + + "\n" + + "fifth=5&sixth=6&seventh=7&eighth=8"; + + String responses = _connector.getResponse(request); + assertTrue(responses.startsWith("HTTP/1.1 200")); + assertThat(new ArrayList<>(reference.get().keySet()), is(Arrays.asList("first", "second", "third", "fourth", "fifth", "sixth", "seventh", "eighth"))); + } + + @Test + public void testParameterExtractionOrderingWithMerge() throws Exception + { + AtomicReference> reference = new AtomicReference<>(); + _handler._checker = new RequestTester() + { + @Override + public boolean check(HttpServletRequest request, HttpServletResponse response) + { + reference.set(request.getParameterMap()); + return true; + } + }; + + String request = "POST /?a=1&b=2&c=3&a=4 HTTP/1.1\r\n" + + "Host: whatever\r\n" + + "Content-Type: application/x-www-form-urlencoded\n" + + "Connection: close\n" + + "Content-Length: 11\n" + + "\n" + + "c=5&b=6&a=7"; + + String responses = _connector.getResponse(request); + Map returnedMap = reference.get(); + assertTrue(responses.startsWith("HTTP/1.1 200")); + assertThat(new ArrayList<>(returnedMap.keySet()), is(Arrays.asList("a", "b", "c"))); + assertTrue(Arrays.equals(returnedMap.get("a"), new String[]{"1", "4", "7"})); + assertTrue(Arrays.equals(returnedMap.get("b"), new String[]{"2", "6"})); + assertTrue(Arrays.equals(returnedMap.get("c"), new String[]{"3", "5"})); + } + @Test public void testParamExtractionBadSequence() throws Exception { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiMap.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiMap.java index fc2d818af9d..481b28f350d 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiMap.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiMap.java @@ -15,8 +15,8 @@ package org.eclipse.jetty.util; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -26,7 +26,7 @@ import java.util.Map; * @param the entry type for multimap values */ @SuppressWarnings("serial") -public class MultiMap extends HashMap> +public class MultiMap extends LinkedHashMap> { public MultiMap() { @@ -316,13 +316,13 @@ public class MultiMap extends HashMap> @Override public String toString() { - Iterator>> iter = entrySet().iterator(); + Iterator>> iter = entrySet().iterator(); StringBuilder sb = new StringBuilder(); sb.append('{'); boolean delim = false; while (iter.hasNext()) { - Entry> e = iter.next(); + Map.Entry> e = iter.next(); if (delim) { sb.append(", "); @@ -350,7 +350,7 @@ public class MultiMap extends HashMap> */ public Map toStringArrayMap() { - HashMap map = new HashMap(size() * 3 / 2) + Map map = new LinkedHashMap(size() * 3 / 2) { @Override public String toString() From 4f52695d4f7c306b9635a6b2419d44bb5bed1ccb Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 17 Feb 2022 10:12:01 +1000 Subject: [PATCH 35/39] Enable errorprone and spotbugs for java 17 (#7604) * add compiler flag to support errorprone for jdk17 and restore spotbugs parsing * spotbugs is fine with jdk17 Signed-off-by: Olivier Lamy --- .mvn/jvm.config | 10 ++++++++++ Jenkinsfile | 8 ++++---- pom.xml | 13 +------------ 3 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 .mvn/jvm.config diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 00000000000..32599cefea5 --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1,10 @@ +--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED diff --git a/Jenkinsfile b/Jenkinsfile index a8c14a84e1b..28b4bd5ef3a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { container('jetty-build') { timeout( time: 120, unit: 'MINUTES' ) { - mavenBuild( "jdk17", "clean install", "maven3") + mavenBuild( "jdk17", "clean install -Perrorprone", "maven3") // Collect up the jacoco execution results (only on main build) jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class', exclusionPattern: '' + @@ -31,7 +31,7 @@ pipeline { execPattern: '**/target/jacoco.exec', classPattern: '**/target/classes', sourcePattern: '**/src/main/java' - recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle()] + recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), errorProne(), spotBugs()] } } } @@ -42,8 +42,8 @@ pipeline { steps { container( 'jetty-build' ) { timeout( time: 120, unit: 'MINUTES' ) { - mavenBuild( "jdk11", "clean install -Dspotbugs.skip=true -Djacoco.skip=true -Perrorprone", "maven3") - recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), errorProne()] + mavenBuild( "jdk11", "clean install -Dspotbugs.skip=true -Djacoco.skip=true", "maven3") + recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle()] } } } diff --git a/pom.xml b/pom.xml index 52dd89bbe77..88b8a0da70b 100644 --- a/pom.xml +++ b/pom.xml @@ -2310,7 +2310,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven.surefire.plugin.version} external, large-disk-resource @@ -2335,9 +2334,9 @@ ${spotbugs.skip} ${spotbugs.failOnError} true - false ${spotbugs.effort} ${spotbugs.threshold} + false @@ -2345,16 +2344,6 @@ - - jdk17 - - [17,) - - - - true - - update-version From 3d70c8b4abaa689d5fe4a12c3aeaf2702dd4af68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 15:14:16 -0600 Subject: [PATCH 36/39] Bump maven-site-plugin from 3.10.0 to 3.11.0 (#7610) Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.10.0 to 3.11.0. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](https://github.com/apache/maven-site-plugin/compare/maven-site-plugin-3.10.0...maven-site-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-site-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f445a572fa8..e977fed49c2 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ 1.7.0 3.2.0 3.2.4 - 3.10.0 + 3.11.0 3.0.0-M5 3.2.1 3.3.2 From 809ed64b12ace797e199a164aa3c203cb8e0c2cb Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 18 Feb 2022 13:31:56 +1000 Subject: [PATCH 37/39] ignore too recent weld version for 9.4.x branch (#7607) Signed-off-by: Olivier Lamy --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cfc1e89fc51..97a3c2ebd89 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,6 +24,8 @@ updates: versions: [ ">=1.1.0" ] - dependency-name: "org.infinispan:*" versions: [ ">=12" ] + - dependency-name: "org.jboss.weld.servlet:*" + versions: [ ">=4.0.0" ] - package-ecosystem: "maven" directory: "/" From 0b3387704008d5f522e577106e1aa366a4efcf23 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 21 Feb 2022 13:45:54 +0100 Subject: [PATCH 38/39] Issue #7344 - wait for forked jetty process (#7374) * Issue #7344 Make plugin wait for forked jetty process to stop Signed-off-by: Jan Bartel --- .../jetty/maven/plugin/JettyStopMojo.java | 153 ++++++++-- .../maven/plugin/MockShutdownMonitor.java | 74 +++++ .../plugin/MockShutdownMonitorRunnable.java | 111 +++++++ .../jetty/maven/plugin/TestJettyStopMojo.java | 279 ++++++++++++++++++ .../eclipse/jetty/server/ShutdownMonitor.java | 8 +- .../jetty/server/ShutdownMonitorTest.java | 30 ++ 6 files changed, 632 insertions(+), 23 deletions(-) create mode 100644 jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/MockShutdownMonitor.java create mode 100644 jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/MockShutdownMonitorRunnable.java create mode 100644 jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/TestJettyStopMojo.java diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java index e471f03ccd0..ba94f5813dc 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java @@ -19,13 +19,16 @@ import java.io.OutputStream; import java.net.ConnectException; import java.net.InetAddress; import java.net.Socket; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; - /** * This goal stops a running instance of jetty. * @@ -72,38 +75,146 @@ public class JettyStopMojo extends AbstractWebAppMojo String command = "forcestop"; - try (Socket s = new Socket(InetAddress.getByName("127.0.0.1"), stopPort);) + if (stopWait > 0) { - OutputStream out = s.getOutputStream(); - out.write((stopKey + "\r\n" + command + "\r\n").getBytes()); - out.flush(); - - if (stopWait > 0) + //try to get the pid of the forked jetty process + Long pid = null; + try { - s.setSoTimeout(stopWait * 1000); - s.getInputStream(); + String response = send(stopKey + "\r\n" + "pid" + "\r\n", stopWait); + pid = Long.valueOf(response); + } + catch (NumberFormatException e) + { + getLog().info("Server returned bad pid"); + } + catch (ConnectException e) + { + //jetty not running, no point continuing + getLog().info("Jetty not running!"); + return; + } + catch (Exception e) + { + //jetty running, try to stop it regardless of error + getLog().error(e); + } - getLog().info("Waiting " + stopWait + " seconds for jetty to stop"); - LineNumberReader lin = new LineNumberReader(new InputStreamReader(s.getInputStream())); - String response; - boolean stopped = false; - while (!stopped && ((response = lin.readLine()) != null)) + //now send the stop command and wait for confirmation - either an ack from jetty, or + //that the process has stopped + if (pid == null) + { + //no pid, so just wait until jetty reports itself stopped + try { + getLog().info("Waiting " + stopWait + " seconds for jetty to stop"); + String response = send(stopKey + "\r\n" + command + "\r\n", stopWait); + if ("Stopped".equals(response)) - { - stopped = true; getLog().info("Server reports itself as stopped"); - } + else + getLog().info("Couldn't verify server as stopped, received " + response); + } + catch (ConnectException e) + { + getLog().info("Jetty not running!"); + } + catch (Exception e) + { + getLog().error(e); } } + else + { + //wait for pid to stop + getLog().info("Waiting " + stopWait + " seconds for jetty " + pid + " to stop"); + Optional optional = ProcessHandle.of(pid); + optional.ifPresentOrElse(p -> + { + try + { + send(stopKey + "\r\n" + command + "\r\n", 0); + CompletableFuture future = p.onExit(); + if (p.isAlive()) + { + p = future.get(stopWait, TimeUnit.SECONDS); + } + + if (p.isAlive()) + getLog().info("Couldn't verify server process stop"); + else + getLog().info("Server process stopped"); + } + catch (ConnectException e) + { + //jetty not listening on the given port, don't wait for the process + getLog().info("Jetty not running!"); + } + catch (TimeoutException e) + { + getLog().error("Timeout expired while waiting for server process to stop"); + } + catch (Throwable e) + { + getLog().error(e); + } + }, () -> getLog().info("Process not running")); + } } - catch (ConnectException e) + else { - getLog().info("Jetty not running!"); + //send the stop command but don't wait to verify the stop + getLog().info("Stopping jetty"); + try + { + send(stopKey + "\r\n" + command + "\r\n", 0); + } + catch (ConnectException e) + { + getLog().info("Jetty not running!"); + } + catch (Exception e) + { + getLog().error(e); + } } - catch (Exception e) + } + + /** + * Send a command to a jetty process, optionally waiting for a response. + * + * @param command the command to send + * @param wait length of time in sec to wait for a response + * @return the response, if any, to the command + * @throws Exception + */ + private String send(String command, int wait) + throws Exception + { + String response = null; + try (Socket s = new Socket(InetAddress.getByName("127.0.0.1"), stopPort); OutputStream out = s.getOutputStream();) { - getLog().error(e); + out.write(command.getBytes()); + out.flush(); + + if (wait > 0) + { + //Wait for a response + s.setSoTimeout(wait * 1000); + + try (LineNumberReader lin = new LineNumberReader(new InputStreamReader(s.getInputStream()));) + { + response = lin.readLine(); + } + } + else + { + //Wait only a small amount of time to ensure TCP has sent the message + s.setSoTimeout(1000); + s.getInputStream().read(); + } + + return response; } } } diff --git a/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/MockShutdownMonitor.java b/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/MockShutdownMonitor.java new file mode 100644 index 00000000000..e7f45193484 --- /dev/null +++ b/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/MockShutdownMonitor.java @@ -0,0 +1,74 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.maven.plugin; + +import java.net.ServerSocket; + +import org.eclipse.jetty.toolchain.test.IO; + +/** + * MockShutdownMonitor + * A helper class that grabs a ServerSocket, spawns a thread and then + * passes the ServerSocket to the Runnable. This class has a main so + * that it can be used for forking, to mimic the actions of the + * org.eclipse.jetty.server.ShutdownMonitor. + */ +public class MockShutdownMonitor +{ + String key; + MockShutdownMonitorRunnable testerRunnable; + ServerSocket serverSocket; + + public MockShutdownMonitor(String key, MockShutdownMonitorRunnable testerRunnable) + throws Exception + { + this.key = key; + this.testerRunnable = testerRunnable; + listen(); + } + + private ServerSocket listen() + throws Exception + { + serverSocket = new ServerSocket(0); + try + { + serverSocket.setReuseAddress(true); + return serverSocket; + } + catch (Throwable e) + { + IO.close(serverSocket); + throw e; + } + } + + public int getPort() + { + if (serverSocket == null) + return 0; + return serverSocket.getLocalPort(); + } + + public void start() + throws Exception + { + testerRunnable.setServerSocket(serverSocket); + testerRunnable.setKey(key); + Thread thread = new Thread(testerRunnable); + thread.setDaemon(true); + thread.setName("Tester Thread"); + thread.start(); + } +} diff --git a/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/MockShutdownMonitorRunnable.java b/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/MockShutdownMonitorRunnable.java new file mode 100644 index 00000000000..bfdb18baf16 --- /dev/null +++ b/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/MockShutdownMonitorRunnable.java @@ -0,0 +1,111 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.maven.plugin; + +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.io.OutputStream; +import java.net.ServerSocket; +import java.net.Socket; +import java.nio.charset.StandardCharsets; + +import org.eclipse.jetty.toolchain.test.IO; + +/** + * MockShutdownMonitorRunnable + * + * Mimics the actions of the org.eclipse.jetty.server.ShutdownMonitor.ShutdownMonitorRunnable + * to aid testing. + */ +public class MockShutdownMonitorRunnable implements Runnable +{ + ServerSocket serverSocket; + String key; + String statusResponse = "OK"; + String pidResponse; + String defaultResponse = "Stopped"; + boolean exit; + + public void setExit(boolean exit) + { + this.exit = exit; + } + + public void setKey(String key) + { + this.key = key; + } + + public void setServerSocket(ServerSocket serverSocket) + { + this.serverSocket = serverSocket; + } + + public void setPidResponse(String pidResponse) + { + this.pidResponse = pidResponse; + } + + public void run() + { + try + { + while (true) + { + try (Socket socket = serverSocket.accept()) + { + LineNumberReader reader = new LineNumberReader(new InputStreamReader(socket.getInputStream())); + String receivedKey = reader.readLine(); + if (!key.equals(receivedKey)) + { + continue; + } + + String cmd = reader.readLine(); + OutputStream out = socket.getOutputStream(); + + if ("status".equalsIgnoreCase(cmd)) + { + out.write((statusResponse + "\r\n").getBytes(StandardCharsets.UTF_8)); + out.flush(); + } + else if ("pid".equalsIgnoreCase(cmd)) + { + out.write((pidResponse + "\r\n").getBytes(StandardCharsets.UTF_8)); + out.flush(); + } + else + { + out.write((defaultResponse + "\r\n").getBytes(StandardCharsets.UTF_8)); + out.flush(); + if (exit) + System.exit(0); + } + } + catch (Throwable x) + { + x.printStackTrace(); + } + } + } + catch (Throwable x) + { + x.printStackTrace(); + } + finally + { + IO.close(serverSocket); + } + } +} diff --git a/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/TestJettyStopMojo.java b/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/TestJettyStopMojo.java new file mode 100644 index 00000000000..749230796cb --- /dev/null +++ b/jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/TestJettyStopMojo.java @@ -0,0 +1,279 @@ +// +// ======================================================================== +// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.maven.plugin; + +import java.io.File; +import java.io.FileReader; +import java.io.LineNumberReader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jetty.server.ShutdownMonitor; +import org.eclipse.jetty.toolchain.test.MavenTestingUtils; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +public class TestJettyStopMojo +{ + /** + * ShutdownMonitorMain + * Kick off the ShutdownMonitor and wait for it to exit. + */ + public static final class ShutdownMonitorMain + { + public static void main(String[] args) + { + try + { + ShutdownMonitor monitor = ShutdownMonitor.getInstance(); + monitor.setPort(0); + monitor.start(); + monitor.await(); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + } + + public static class TestLog implements org.apache.maven.plugin.logging.Log + { + List sink = new ArrayList<>(); + + @Override + public boolean isDebugEnabled() + { + return true; + } + + @Override + public void debug(CharSequence content) + { + sink.add(content.toString()); + } + + @Override + public void debug(CharSequence content, Throwable error) + { + sink.add(content.toString()); + } + + @Override + public void debug(Throwable error) + { + } + + @Override + public boolean isInfoEnabled() + { + return true; + } + + @Override + public void info(CharSequence content) + { + sink.add(content.toString()); + } + + @Override + public void info(CharSequence content, Throwable error) + { + sink.add(content.toString()); + } + + @Override + public void info(Throwable error) + { + } + + @Override + public boolean isWarnEnabled() + { + return true; + } + + @Override + public void warn(CharSequence content) + { + sink.add(content.toString()); + } + + @Override + public void warn(CharSequence content, Throwable error) + { + sink.add(content.toString()); + } + + @Override + public void warn(Throwable error) + { + } + + @Override + public boolean isErrorEnabled() + { + return true; + } + + @Override + public void error(CharSequence content) + { + sink.add(content.toString()); + } + + @Override + public void error(CharSequence content, Throwable error) + { + sink.add(content.toString()); + } + + @Override + public void error(Throwable error) + { + } + + public void assertContains(String str) + { + assertThat(sink, Matchers.hasItem(str)); + } + + public void dumpStdErr() + { + for (String s : sink) + { + System.err.println(s); + } + } + } + + @Test + public void testStopNoWait() throws Exception + { + //send a stop message and don't wait for the reply or the process to shutdown + String stopKey = "foo"; + MockShutdownMonitorRunnable runnable = new MockShutdownMonitorRunnable(); + runnable.setPidResponse("abcd"); + MockShutdownMonitor monitor = new MockShutdownMonitor(stopKey, runnable); + monitor.start(); + + TestLog log = new TestLog(); + JettyStopMojo mojo = new JettyStopMojo(); + mojo.stopKey = stopKey; + mojo.stopPort = monitor.getPort(); + mojo.setLog(log); + + mojo.execute(); + + log.assertContains("Stopping jetty"); + } + + @Test + public void testStopWaitBadPid() throws Exception + { + //test that even if we receive a bad pid, we still send the stop command and wait to + //receive acknowledgement, but we don't wait for the process to exit + String stopKey = "foo"; + MockShutdownMonitorRunnable runnable = new MockShutdownMonitorRunnable(); + runnable.setPidResponse("abcd"); + MockShutdownMonitor monitor = new MockShutdownMonitor(stopKey, runnable); + monitor.start(); + + TestLog log = new TestLog(); + JettyStopMojo mojo = new JettyStopMojo(); + mojo.stopWait = 5; + mojo.stopKey = stopKey; + mojo.stopPort = monitor.getPort(); + mojo.setLog(log); + + mojo.execute(); + + log.assertContains("Server returned bad pid"); + log.assertContains("Server reports itself as stopped"); + } + + @Test + public void testStopWait() throws Exception + { + //test that we will communicate with a remote process and wait for it to exit + String stopKey = "foo"; + List cmd = new ArrayList<>(); + String java = "java"; + String[] javaexes = new String[]{"java", "java.exe"}; + File javaHomeDir = new File(System.getProperty("java.home")); + Path javaHomePath = javaHomeDir.toPath(); + for (String javaexe : javaexes) + { + Path javaBinPath = javaHomePath.resolve(Paths.get("bin", javaexe)); + if (Files.exists(javaBinPath) && !Files.isDirectory(javaBinPath)) + java = javaBinPath.toFile().getAbsolutePath(); + } + + cmd.add(java); + cmd.add("-DSTOP.KEY=" + stopKey); + cmd.add("-DDEBUG=true"); + cmd.add("-cp"); + cmd.add(System.getProperty("java.class.path")); + cmd.add(ShutdownMonitorMain.class.getName()); + + ProcessBuilder command = new ProcessBuilder(cmd); + File file = MavenTestingUtils.getTargetFile("tester.out"); + command.redirectOutput(file); + command.redirectErrorStream(true); + command.directory(MavenTestingUtils.getTargetDir()); + Process fork = command.start(); + + Thread.sleep(500); + while (!file.exists() && file.length() == 0) + { + Thread.sleep(300); + } + + String tmp = ""; + String port = null; + try (LineNumberReader reader = new LineNumberReader(new FileReader(file))) + { + while (port == null && tmp != null) + { + tmp = reader.readLine(); + if (tmp != null) + { + if (tmp.startsWith("STOP.PORT=")) + port = tmp.substring(10); + } + } + } + + assertNotNull(port); + + TestLog log = new TestLog(); + JettyStopMojo mojo = new JettyStopMojo(); + mojo.stopWait = 5; + mojo.stopKey = stopKey; + mojo.stopPort = Integer.parseInt(port); + mojo.setLog(log); + + mojo.execute(); + + log.dumpStdErr(); + log.assertContains("Waiting " + mojo.stopWait + " seconds for jetty " + fork.pid() + " to stop"); + log.assertContains("Server process stopped"); + } +} diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java index da8f3242ad3..bdfcd2a770c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java @@ -205,7 +205,7 @@ public class ShutdownMonitor } } - protected void start() throws Exception + public void start() throws Exception { try (AutoLock l = _lock.lock()) { @@ -236,7 +236,7 @@ public class ShutdownMonitor } // For test purposes only. - void await() throws InterruptedException + public void await() throws InterruptedException { try (AutoLock.WithCondition l = _lock.lock()) { @@ -407,6 +407,10 @@ public class ShutdownMonitor // Reply to client informClient(out, "OK\r\n"); } + else if ("pid".equalsIgnoreCase(cmd)) + { + informClient(out, Long.toString(ProcessHandle.current().pid())); + } } catch (Throwable x) { diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java index fd0218d56a2..e93fdb78362 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java @@ -37,6 +37,36 @@ public class ShutdownMonitorTest { ShutdownMonitor.reset(); } + + @Test + public void testPid() throws Exception + { + ShutdownMonitor monitor = ShutdownMonitor.getInstance(); + monitor.setPort(0); + monitor.setExitVm(false); + monitor.start(); + String key = monitor.getKey(); + int port = monitor.getPort(); + + // Try more than once to be sure that the ServerSocket has not been closed. + for (int i = 0; i < 2; ++i) + { + try (Socket socket = new Socket("localhost", port)) + { + OutputStream output = socket.getOutputStream(); + String command = "pid"; + output.write((key + "\r\n" + command + "\r\n").getBytes()); + output.flush(); + + BufferedReader input = new BufferedReader(new InputStreamReader(socket.getInputStream())); + String reply = input.readLine(); + String pid = String.valueOf(ProcessHandle.current().pid()); + assertEquals(pid, reply); + // Socket must be closed afterwards. + assertNull(input.readLine()); + } + } + } @Test public void testStatus() throws Exception From 217edab7328876fb4050d391c6d52a1f485dc3f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 08:48:04 -0600 Subject: [PATCH 39/39] Bump grpc-core from 1.44.0 to 1.44.1 (#7629) Bumps [grpc-core](https://github.com/grpc/grpc-java) from 1.44.0 to 1.44.1. - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.44.0...v1.44.1) --- updated-dependencies: - dependency-name: io.grpc:grpc-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e977fed49c2..a1af5cfdb27 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 7.0.3 3.0.2 2.11.0 - 1.44.0 + 1.44.1 2.9.0 31.0.1-jre 5.1.0