From 761e3bbe26479e62771400f0a43701660413f256 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 6 May 2024 11:14:02 -0300 Subject: [PATCH 01/19] Adding README.md to 9.4.x --- README.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 028cdfa..dc4be44 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,54 @@ -# jetty-examples -Eclipse Jetty® - Examples +![jetty logo](https://raw.githubusercontent.com/jetty/jetty.project/jetty-12.0.x/logos/jetty-logo-200.png) + +[![9.4.x](https://github.com/jetty/jetty-examples/actions/workflows/ci.yml/badge.svg?branch=9.4.x)](https://github.com/jetty/jetty-examples/actions/workflows/ci.yml) + +# Eclipse Jetty® - Examples + +This is a collection of examples of how to use various features +present in the Eclipse Jetty server and Eclipse Jetty client. + +There are a few major categories of examples. + +## Embedded Examples + +Using Embedded Jetty is extremely powerful way to include Jetty +in your Java application using Code (instead of configuration) to +setup a Jetty server or Jetty client. + +Here you will see answers to common questions about how to +integrate various features of Jetty, and also how to enable features +of 3rd party libraries within Jetty (such as JSP, REST, and CDI). + +## Standalone Examples + +The Standalone examples present fully formed `${jetty.base}` directories +that can be used to understand how to configure the jetty module system +and its various components to reach an end goal. + +## Webapp Examples + +A collection of various WAR files that can be used to demonstrate +how to use web and JVM features in Jetty. + +--- + +### All Example Branches + +| Branch | Min JDK | EE | Servlet | Namespace | Supported | +|--------------|---------|------|---------|-------------------|-----------------------------------------| +| [12.0.x][6] | 17 | EE10 | 6.0 | `jakarta.servlet` | Yes | +| [12.0.x][6] | 17 | EE9 | 5.0 | `jakarta.servlet` | Yes | +| [12.0.x][6] | 17 | EE8 | 4.0 | `javax.servlet` | Yes | +| [11.0.x][1] | 11 | EE9 | 5.0 | `jakarta.servlet` | No (as of January 2024) [See #10485][4] | +| [10.0.x][2] | 11 | EE8 | 4.0 | `javax.servlet` | No (as of January 2024) [See #10485][4] | +| [9.4.x][3] | 8 | EE7 | 3.1 | `javax.servlet` | No (as of June 2022) [See #7958][5] | + +[1]: https://github.com/jetty/jetty-examples/tree/11.0.x +[2]: https://github.com/jetty/jetty-examples/tree/10.0.x +[3]: https://github.com/jetty/jetty-examples/tree/9.4.x +[4]: https://github.com/jetty/jetty.project/issues/10485 +[5]: https://github.com/jetty/jetty.project/issues/7958 +[6]: https://github.com/jetty/jetty-examples/tree/12.0.x +[7]: embedded/README.md +[8]: standalone/README.md +[9]: webapps/README.md \ No newline at end of file From 7bad1a39b361b41500835fe44faa9587aa4a929b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 08:47:51 +0000 Subject: [PATCH 02/19] Bump commons-logging:commons-logging from 1.3.1 to 1.3.2 Bumps commons-logging:commons-logging from 1.3.1 to 1.3.2. --- updated-dependencies: - dependency-name: commons-logging:commons-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- webapps/logging-overlap/lib-using-commonslogging/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/logging-overlap/lib-using-commonslogging/pom.xml b/webapps/logging-overlap/lib-using-commonslogging/pom.xml index 884f6f9..c76cea4 100644 --- a/webapps/logging-overlap/lib-using-commonslogging/pom.xml +++ b/webapps/logging-overlap/lib-using-commonslogging/pom.xml @@ -13,7 +13,7 @@ Jetty Examples :: 9.4.x :: WebApp Logging Overlap :: Lib w/commons-logging - 1.3.1 + 1.3.2 From 3374648d99ef924c9bf92d08a43fed8496ec9ae9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 09:03:53 +0000 Subject: [PATCH 03/19] --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- embedded/jsp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embedded/jsp/pom.xml b/embedded/jsp/pom.xml index b13efec..e6a85c5 100644 --- a/embedded/jsp/pom.xml +++ b/embedded/jsp/pom.xml @@ -13,7 +13,7 @@ 1.5.6 - 3.2.0 + 3.3.0 2.0.13 From 5480225a4084c733c67a271cff8c8af46fead976 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 08:35:22 +0000 Subject: [PATCH 04/19] Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.3 to 3.6.0 Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.3...maven-shade-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- embedded/uber-jar/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embedded/uber-jar/pom.xml b/embedded/uber-jar/pom.xml index 5187032..a5c54e1 100644 --- a/embedded/uber-jar/pom.xml +++ b/embedded/uber-jar/pom.xml @@ -15,7 +15,7 @@ 2.23.1 - 3.5.3 + 3.6.0 UTF-8 From fd750a2d78d3cdc6ea1b61ea43fb6a23087af487 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:57:17 +0000 Subject: [PATCH 05/19] Bump org.apache.maven.plugins:maven-dependency-plugin Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.1 to 3.7.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.1...maven-dependency-plugin-3.7.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- webapps/logging-overlap/demobase/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/logging-overlap/demobase/pom.xml b/webapps/logging-overlap/demobase/pom.xml index 805b74f..414fbec 100644 --- a/webapps/logging-overlap/demobase/pom.xml +++ b/webapps/logging-overlap/demobase/pom.xml @@ -13,7 +13,7 @@ Jetty Examples :: 9.4.x :: WebApp Logging Overlap :: Demo Base - 3.6.1 + 3.7.0 3.6.1 2.23.1 1.7.36 From 5090c6437dc255f00a1f8547d8ae463667ae5120 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 08:28:53 +0000 Subject: [PATCH 06/19] Bump org.apache.maven.plugins:maven-dependency-plugin Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.7.0...maven-dependency-plugin-3.7.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- webapps/logging-overlap/demobase/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/logging-overlap/demobase/pom.xml b/webapps/logging-overlap/demobase/pom.xml index 414fbec..636f234 100644 --- a/webapps/logging-overlap/demobase/pom.xml +++ b/webapps/logging-overlap/demobase/pom.xml @@ -13,7 +13,7 @@ Jetty Examples :: 9.4.x :: WebApp Logging Overlap :: Demo Base - 3.7.0 + 3.7.1 3.6.1 2.23.1 1.7.36 From 3463b7b3314cef87f8b04852df70b9a18ca95944 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 08:35:59 +0000 Subject: [PATCH 07/19] Bump slf4j.version from 2.0.13 to 2.0.13 Bumps `slf4j.version` from 2.0.13 to 2.0.13. Updates `org.slf4j:jul-to-slf4j` from 2.0.13 to 2.0.13 Updates `org.slf4j:slf4j-api` from 2.0.9 to 2.0.13 --- updated-dependencies: - dependency-name: org.slf4j:jul-to-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- webapps/loosely-coupled-webapps/webapp-A/pom.xml | 2 +- webapps/loosely-coupled-webapps/webapp-B/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/loosely-coupled-webapps/webapp-A/pom.xml b/webapps/loosely-coupled-webapps/webapp-A/pom.xml index 1129260..2a79fa7 100644 --- a/webapps/loosely-coupled-webapps/webapp-A/pom.xml +++ b/webapps/loosely-coupled-webapps/webapp-A/pom.xml @@ -14,7 +14,7 @@ org.slf4j slf4j-api - 2.0.9 + 2.0.13 jakarta.servlet diff --git a/webapps/loosely-coupled-webapps/webapp-B/pom.xml b/webapps/loosely-coupled-webapps/webapp-B/pom.xml index ce0f8d6..9c865e2 100644 --- a/webapps/loosely-coupled-webapps/webapp-B/pom.xml +++ b/webapps/loosely-coupled-webapps/webapp-B/pom.xml @@ -14,7 +14,7 @@ org.slf4j slf4j-api - 2.0.9 + 2.0.13 jakarta.servlet From caa008330479e4cdd1e1439f2a310d8428e1cbdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 08:52:19 +0000 Subject: [PATCH 08/19] Bump slf4j.version from 2.0.13 to 2.0.13 Bumps `slf4j.version` from 2.0.13 to 2.0.13. Updates `org.slf4j:jul-to-slf4j` from 2.0.13 to 2.0.13 Updates `org.slf4j:slf4j-api` from 2.0.9 to 2.0.13 --- updated-dependencies: - dependency-name: org.slf4j:jul-to-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- webapps/loosely-coupled-webapps/webapp-A/pom.xml | 2 +- webapps/loosely-coupled-webapps/webapp-B/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/loosely-coupled-webapps/webapp-A/pom.xml b/webapps/loosely-coupled-webapps/webapp-A/pom.xml index 89b1cd2..e18cfca 100644 --- a/webapps/loosely-coupled-webapps/webapp-A/pom.xml +++ b/webapps/loosely-coupled-webapps/webapp-A/pom.xml @@ -14,7 +14,7 @@ org.slf4j slf4j-api - 2.0.9 + 2.0.13 jakarta.servlet diff --git a/webapps/loosely-coupled-webapps/webapp-B/pom.xml b/webapps/loosely-coupled-webapps/webapp-B/pom.xml index 047214e..48585b6 100644 --- a/webapps/loosely-coupled-webapps/webapp-B/pom.xml +++ b/webapps/loosely-coupled-webapps/webapp-B/pom.xml @@ -14,7 +14,7 @@ org.slf4j slf4j-api - 2.0.9 + 2.0.13 jakarta.servlet From 25c9dadb615a5c4e7a1232517b77be86220baf08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 08:11:34 +0000 Subject: [PATCH 09/19] Bump org.junit.jupiter:junit-jupiter-api from 5.10.2 to 5.10.3 Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- standalone/lowresource-access/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/lowresource-access/pom.xml b/standalone/lowresource-access/pom.xml index 64e27a3..136d137 100644 --- a/standalone/lowresource-access/pom.xml +++ b/standalone/lowresource-access/pom.xml @@ -58,7 +58,7 @@ org.junit.jupiter junit-jupiter-api - 5.10.2 + 5.10.3 test From f8759f82606365237efa83405bebda90df92ef50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 08:24:08 +0000 Subject: [PATCH 10/19] Bump org.junit.jupiter:junit-jupiter-api from 5.10.2 to 5.10.3 Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- standalone/lowresource-access/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/lowresource-access/pom.xml b/standalone/lowresource-access/pom.xml index 14dcb1c..8e94503 100644 --- a/standalone/lowresource-access/pom.xml +++ b/standalone/lowresource-access/pom.xml @@ -53,7 +53,7 @@ org.junit.jupiter junit-jupiter-api - 5.10.2 + 5.10.3 test From f6b9a82eacea4ca023224b3e9912a736d087b7a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 08:58:24 +0000 Subject: [PATCH 11/19] Bump org.junit.jupiter:junit-jupiter-api from 5.10.2 to 5.10.3 Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- standalone/lowresource-access/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/lowresource-access/pom.xml b/standalone/lowresource-access/pom.xml index 90cefec..13fc320 100644 --- a/standalone/lowresource-access/pom.xml +++ b/standalone/lowresource-access/pom.xml @@ -58,7 +58,7 @@ org.junit.jupiter junit-jupiter-api - 5.10.2 + 5.10.3 test From 52d0f363cd676bcfb73296c929678a8654372a67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 08:43:36 +0000 Subject: [PATCH 12/19] Bump jetty.version from 9.4.54.v20240208 to 9.4.55.v20240627 Bumps `jetty.version` from 9.4.54.v20240208 to 9.4.55.v20240627. Updates `org.eclipse.jetty:jetty-server` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-webapp` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-servlet` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-deploy` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-xml` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-client` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-plus` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:apache-jsp` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:apache-jstl` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-http` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-rewrite` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-cdi` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty.websocket:javax-websocket-server-impl` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-annotations` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-maven-plugin` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-servlets` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-jaspi` from 9.4.54.v20240208 to 9.4.55.v20240627 --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-servlet dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-deploy dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-xml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-plus dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jsp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jstl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-rewrite dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-cdi dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:javax-websocket-server-impl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-annotations dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-servlets dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-jaspi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- embedded/uber-war/pom.xml | 2 +- pom.xml | 2 +- webapps/http2-client-from-webapp/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/embedded/uber-war/pom.xml b/embedded/uber-war/pom.xml index f2a3e8c..3e4a825 100644 --- a/embedded/uber-war/pom.xml +++ b/embedded/uber-war/pom.xml @@ -22,7 +22,7 @@ - 9.4.54.v20240208 + 9.4.55.v20240627 UTF-8 3.1.0 1.0 diff --git a/pom.xml b/pom.xml index d99fc06..34e68f1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 8 5.9 jetty-examples - 9.4.54.v20240208 + 9.4.55.v20240627 diff --git a/webapps/http2-client-from-webapp/pom.xml b/webapps/http2-client-from-webapp/pom.xml index 9a04810..f6e48de 100644 --- a/webapps/http2-client-from-webapp/pom.xml +++ b/webapps/http2-client-from-webapp/pom.xml @@ -13,7 +13,7 @@ 2.0.10 - 9.4.54.v20240208 + 9.4.55.v20240627 2.23.1 3.1.0 From c5df4319ffb43be84be765c8559c59b3846c6a1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 08:50:26 +0000 Subject: [PATCH 13/19] Bump jetty.version from 10.0.21 to 10.0.22 Bumps `jetty.version` from 10.0.21 to 10.0.22. Updates `org.eclipse.jetty:jetty-client` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-slf4j-impl` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty.http2:http2-client` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty.http2:http2-http-client-transport` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-server` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-webapp` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-servlet` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-deploy` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-xml` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-cdi` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-plus` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:apache-jsp` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:apache-jstl` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-http` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-rewrite` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty.websocket:websocket-javax-server` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-annotations` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty.websocket:websocket-jetty-client` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty.websocket:websocket-jetty-server` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-maven-plugin` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-servlets` from 10.0.21 to 10.0.22 Updates `org.eclipse.jetty:jetty-jaspi` from 10.0.21 to 10.0.22 --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-slf4j-impl dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.http2:http2-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.http2:http2-http-client-transport dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-servlet dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-deploy dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-xml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-cdi dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-plus dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jsp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jstl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-rewrite dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-javax-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-annotations dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-jetty-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-servlets dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-jaspi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- webapps/http2-client-from-webapp/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index df1b880..f9afd22 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 11 6.2 jetty-examples - 10.0.21 + 10.0.22 diff --git a/webapps/http2-client-from-webapp/pom.xml b/webapps/http2-client-from-webapp/pom.xml index 1701856..e55edd5 100644 --- a/webapps/http2-client-from-webapp/pom.xml +++ b/webapps/http2-client-from-webapp/pom.xml @@ -13,7 +13,7 @@ 2.0.10 - 10.0.21 + 10.0.22 2.23.1 4.0.4 From 6587e27a7ff749a5b83854ec7f015c516a17f508 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 09:03:26 +0000 Subject: [PATCH 14/19] Bump jetty.version from 11.0.21 to 11.0.22 Bumps `jetty.version` from 11.0.21 to 11.0.22. Updates `org.eclipse.jetty:jetty-client` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-slf4j-impl` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty.http2:http2-client` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty.http2:http2-http-client-transport` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-server` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-webapp` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-servlet` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-deploy` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-xml` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-cdi` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-plus` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:apache-jsp` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:glassfish-jstl` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-http` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-rewrite` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty.websocket:websocket-jakarta-server` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-annotations` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty.websocket:websocket-jetty-client` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty.websocket:websocket-jetty-server` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-maven-plugin` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-servlets` from 11.0.21 to 11.0.22 Updates `org.eclipse.jetty:jetty-jaspi` from 11.0.21 to 11.0.22 --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-slf4j-impl dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.http2:http2-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.http2:http2-http-client-transport dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-servlet dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-deploy dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-xml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-cdi dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-plus dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jsp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:glassfish-jstl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-rewrite dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-jakarta-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-annotations dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-jetty-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-servlets dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-jaspi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- webapps/http2-client-from-webapp/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 90e41c5..f649a5f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 11 6.2 jetty-examples - 11.0.21 + 11.0.22 diff --git a/webapps/http2-client-from-webapp/pom.xml b/webapps/http2-client-from-webapp/pom.xml index 6d092f4..1863f2b 100644 --- a/webapps/http2-client-from-webapp/pom.xml +++ b/webapps/http2-client-from-webapp/pom.xml @@ -13,7 +13,7 @@ 2.0.10 - 11.0.21 + 11.0.22 2.23.1 5.0.0 From a1eb8a870a8cb4639c0e1606050d035a3dd4beb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 08:14:04 +0000 Subject: [PATCH 15/19] Bump commons-logging:commons-logging from 1.3.2 to 1.3.3 Bumps commons-logging:commons-logging from 1.3.2 to 1.3.3. --- updated-dependencies: - dependency-name: commons-logging:commons-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- webapps/logging-overlap/lib-using-commonslogging/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/logging-overlap/lib-using-commonslogging/pom.xml b/webapps/logging-overlap/lib-using-commonslogging/pom.xml index 892ad94..c8fa45e 100644 --- a/webapps/logging-overlap/lib-using-commonslogging/pom.xml +++ b/webapps/logging-overlap/lib-using-commonslogging/pom.xml @@ -13,7 +13,7 @@ Jetty Examples :: 11.0.x :: WebApp Logging Overlap :: Lib w/commons-logging - 1.3.2 + 1.3.3 From c2883909627cf40c80800fac65267e2dd72f3273 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 08:43:53 +0000 Subject: [PATCH 16/19] Bump commons-logging:commons-logging from 1.3.2 to 1.3.3 Bumps commons-logging:commons-logging from 1.3.2 to 1.3.3. --- updated-dependencies: - dependency-name: commons-logging:commons-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- webapps/logging-overlap/lib-using-commonslogging/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/logging-overlap/lib-using-commonslogging/pom.xml b/webapps/logging-overlap/lib-using-commonslogging/pom.xml index c76cea4..d8e6a1d 100644 --- a/webapps/logging-overlap/lib-using-commonslogging/pom.xml +++ b/webapps/logging-overlap/lib-using-commonslogging/pom.xml @@ -13,7 +13,7 @@ Jetty Examples :: 9.4.x :: WebApp Logging Overlap :: Lib w/commons-logging - 1.3.2 + 1.3.3 From 3742dd6e7e63f92411bc57267f5936ae5b82a6da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 08:58:15 +0000 Subject: [PATCH 17/19] Bump commons-logging:commons-logging from 1.3.2 to 1.3.3 Bumps commons-logging:commons-logging from 1.3.2 to 1.3.3. --- updated-dependencies: - dependency-name: commons-logging:commons-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- webapps/logging-overlap/lib-using-commonslogging/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/logging-overlap/lib-using-commonslogging/pom.xml b/webapps/logging-overlap/lib-using-commonslogging/pom.xml index ac2c72a..3733638 100644 --- a/webapps/logging-overlap/lib-using-commonslogging/pom.xml +++ b/webapps/logging-overlap/lib-using-commonslogging/pom.xml @@ -13,7 +13,7 @@ Jetty Examples :: 10.0.x :: WebApp Logging Overlap :: Lib w/commons-logging - 1.3.2 + 1.3.3 From a4d63fb54989ebf3f51186370c0e3f6763aa5fbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 08:24:54 +0000 Subject: [PATCH 18/19] Bump jetty.version from 9.4.54.v20240208 to 9.4.55.v20240627 Bumps `jetty.version` from 9.4.54.v20240208 to 9.4.55.v20240627. Updates `org.eclipse.jetty:jetty-alpn-openjdk8-server` from 9.4.54.v20240208 to 9.4.55.v20240627 Updates `org.eclipse.jetty:jetty-alpn-java-server` from 9.4.54.v20240208 to 9.4.55.v20240627 --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-alpn-openjdk8-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-alpn-java-server dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- webapps/http2-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/http2-demo/pom.xml b/webapps/http2-demo/pom.xml index a819aab..e7568ec 100644 --- a/webapps/http2-demo/pom.xml +++ b/webapps/http2-demo/pom.xml @@ -13,7 +13,7 @@ 2.0.10 - 9.4.54.v20240208 + 9.4.55.v20240627 2.23.1 3.1.0 2.0.12 From 3896a6eaf9f25e89cb61e4f1eaed08c59ce5c5e7 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 23 Jul 2024 17:32:17 -0500 Subject: [PATCH 19/19] Reimplementing examples from github.com/jetty-project/limited-requests-listener --- embedded/limited-requests/pom.xml | 41 +++++++++ .../java/examples/LimitedRequestsExample.java | 63 ++++++++++++++ .../examples/LimitedRequestsListener.java | 47 ++++++++++ .../examples/LimitedRequestsExampleTest.java | 86 +++++++++++++++++++ embedded/pom.xml | 1 + 5 files changed, 238 insertions(+) create mode 100644 embedded/limited-requests/pom.xml create mode 100644 embedded/limited-requests/src/main/java/examples/LimitedRequestsExample.java create mode 100644 embedded/limited-requests/src/main/java/examples/LimitedRequestsListener.java create mode 100644 embedded/limited-requests/src/test/java/examples/LimitedRequestsExampleTest.java diff --git a/embedded/limited-requests/pom.xml b/embedded/limited-requests/pom.xml new file mode 100644 index 0000000..7fe985f --- /dev/null +++ b/embedded/limited-requests/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + org.eclipse.jetty.examples.embedded + jetty-embedded-examples + 9.4.x + + limited-requests + 9.4.x + jar + Jetty Examples :: Jetty 9.4.x :: Embedded :: Limited Requests + + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-client + ${jetty.version} + test + + + org.eclipse.jetty + jetty-http + ${jetty.version} + tests + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + ${jetty-test-helper.version} + test + + + + diff --git a/embedded/limited-requests/src/main/java/examples/LimitedRequestsExample.java b/embedded/limited-requests/src/main/java/examples/LimitedRequestsExample.java new file mode 100644 index 0000000..fed4cfd --- /dev/null +++ b/embedded/limited-requests/src/main/java/examples/LimitedRequestsExample.java @@ -0,0 +1,63 @@ +// +// ======================================================================== +// Copyright (c) 1995 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 examples; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.handler.AbstractHandler; + +public class LimitedRequestsExample +{ + public static void main(String[] args) throws Exception + { + Server server = newServer(8080); + server.start(); + server.join(); + } + + public static Server newServer(int port) + { + Server server = new Server(); + ServerConnector connector = new ServerConnector(server); + connector.setPort(port); + + LimitedRequestsListener limitedRequestsListener = new LimitedRequestsListener(); + limitedRequestsListener.setMaxRequests(5); + connector.addBean(limitedRequestsListener); + + server.addConnector(connector); + + server.setHandler(new HelloHandler()); + return server; + } + + private static class HelloHandler extends AbstractHandler + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + response.setStatus(200); + response.setCharacterEncoding("utf-8"); + response.setContentType("text/plain"); + response.getWriter().println("Hello World"); + baseRequest.setHandled(true); + } + } +} diff --git a/embedded/limited-requests/src/main/java/examples/LimitedRequestsListener.java b/embedded/limited-requests/src/main/java/examples/LimitedRequestsListener.java new file mode 100644 index 0000000..df24369 --- /dev/null +++ b/embedded/limited-requests/src/main/java/examples/LimitedRequestsListener.java @@ -0,0 +1,47 @@ +// +// ======================================================================== +// Copyright (c) 1995 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 examples; + +import org.eclipse.jetty.server.HttpChannel; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; + +public class LimitedRequestsListener implements HttpChannel.Listener +{ + private static final Logger LOG = Log.getLogger(LimitedRequestsListener.class); + private int maxRequests = 10; + + public int getMaxRequests() + { + return maxRequests; + } + + public void setMaxRequests(int maxRequests) + { + this.maxRequests = maxRequests; + } + + @Override + public void onResponseBegin(Request request) + { + long requests = request.getHttpChannel().getRequests(); + // After X responses, forcibly set connection close on response + if (requests >= maxRequests) + { + request.getResponse().setHeader("Connection", "close"); + LOG.debug("Setting [Connection: Close] on Request #{} for {}", requests, request.getHttpChannel().getEndPoint().getTransport()); + } + } +} \ No newline at end of file diff --git a/embedded/limited-requests/src/test/java/examples/LimitedRequestsExampleTest.java b/embedded/limited-requests/src/test/java/examples/LimitedRequestsExampleTest.java new file mode 100644 index 0000000..583718d --- /dev/null +++ b/embedded/limited-requests/src/test/java/examples/LimitedRequestsExampleTest.java @@ -0,0 +1,86 @@ +// +// ======================================================================== +// Copyright (c) 1995 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 examples; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.net.URI; +import java.nio.charset.StandardCharsets; + +import org.eclipse.jetty.http.HttpHeader; +import org.eclipse.jetty.http.HttpTester; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.util.component.LifeCycle; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; + +public class LimitedRequestsExampleTest +{ + private Server server; + + @BeforeEach + public void startServer() throws Exception + { + server = LimitedRequestsExample.newServer(0); + server.start(); + } + + @AfterEach + public void stopServer() + { + LifeCycle.stop(server); + } + + @Test + public void testLimitedRequests() throws IOException + { + URI serverURI = server.getURI(); + + String rawRequest = "GET / HTTP/1.1\r\n" + + "Host: " + serverURI.getRawAuthority() + "\r\n" + + "\r\n"; + + try (Socket client = new Socket(serverURI.getHost(), serverURI.getPort()); + OutputStream out = client.getOutputStream(); + InputStream in = client.getInputStream();) + { + // Per configuration of setMaxRequests in LimitedRequestsExample this will allow + // only 5 requests before sending a Connection: close + for (int i = 1; i < 5; i++) + { + out.write(rawRequest.getBytes(StandardCharsets.UTF_8)); + out.flush(); + + HttpTester.Response response = HttpTester.parseResponse(in); + assertThat(response.getStatus(), is(200)); + assertThat(response.get(HttpHeader.CONNECTION), is(nullValue())); + } + + // and one final one should trigger the closure + out.write(rawRequest.getBytes(StandardCharsets.UTF_8)); + out.flush(); + + HttpTester.Response response = HttpTester.parseResponse(in); + assertThat(response.getStatus(), is(200)); + assertThat(response.get(HttpHeader.CONNECTION), is("close")); + } + } +} diff --git a/embedded/pom.xml b/embedded/pom.xml index 85203a6..538676d 100644 --- a/embedded/pom.xml +++ b/embedded/pom.xml @@ -24,6 +24,7 @@ http-config jndi jsp + limited-requests logging-java-util-logging logging-mixed logging-slf4j