From 64e67d5f78624017550a553677835803cd60625e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 09:17:52 +0000 Subject: [PATCH 1/7] Bump plexus-utils from 3.4.1 to 3.4.2 Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.4.1 to 3.4.2. - [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases) - [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.4.1...plexus-utils-3.4.2) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-utils 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 4349b20a82c..80e1a9a009a 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ 1.2.0 1.2.0 2.1.1 - 3.4.1 + 3.4.2 2.0.0-alpha6 2.1.1.RELEASE 1.2.5 From 7c207e91f444b34a998b9e7638372c42e49fbf75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 09:24:02 +0000 Subject: [PATCH 2/7] Bump logback-core from 1.3.0-alpha15 to 1.3.0-alpha16 Bumps [logback-core](https://github.com/qos-ch/logback) from 1.3.0-alpha15 to 1.3.0-alpha16. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](https://github.com/qos-ch/logback/compare/v_1.3.0-alpha15...v_1.3.0-alpha16) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-core dependency-type: direct:production 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 4349b20a82c..9571593c75c 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ 5.8.2 2.0.2 2.17.2 - 1.3.0-alpha15 + 1.3.0-alpha16 3.0.4 10.3.6 0.13.1 From 14c0004c040b68fb9c3cb1f0923be029bb7fff31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 09:24:32 +0000 Subject: [PATCH 3/7] Bump spotbugs-maven-plugin from 4.6.0.0 to 4.7.0.0 Bumps [spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) from 4.6.0.0 to 4.7.0.0. - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.6.0.0...spotbugs-maven-plugin-4.7.0.0) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-maven-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 4349b20a82c..a159b3dfeb2 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 3.0.0-M5 3.2.1 3.3.2 - 4.6.0.0 + 4.7.0.0 2.10.0 From 66289a54e89df2f54dfaa47be06953113fb7722a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 09:24:42 +0000 Subject: [PATCH 4/7] Bump testcontainers-bom from 1.17.1 to 1.17.2 Bumps [testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.17.1 to 1.17.2. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.1...1.17.2) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-type: direct:production 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 4349b20a82c..82579360b18 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ 2.1.1.RELEASE 1.2.5 1.2.5 - 1.17.1 + 1.17.2 3.1.9.Final 1.6.0.Final 1.19.0.Final From 279574a07e55a0e2f512aa04600f8b23ea3e57e0 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 20 May 2022 21:55:59 +1000 Subject: [PATCH 5/7] make jetty-p2 depending jetty-home so we sure it's build last even when using -Tx option (#8026) see https://github.com/eclipse/jetty.project/issues/8021 Signed-off-by: Olivier Lamy --- jetty-p2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index 2361427106d..f8bd0a33371 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -43,7 +43,7 @@ artifacts are created --> org.eclipse.jetty - jetty-bom + jetty-home ${project.version} pom From ef9d885a057fbf3216f40970130207e6652593c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 09:18:49 +0000 Subject: [PATCH 6/7] Bump versions-maven-plugin from 2.10.0 to 2.11.0 Bumps [versions-maven-plugin](https://github.com/mojohaus/versions-maven-plugin) from 2.10.0 to 2.11.0. - [Release notes](https://github.com/mojohaus/versions-maven-plugin/releases) - [Changelog](https://github.com/mojohaus/versions-maven-plugin/blob/master/ReleaseNotes.md) - [Commits](https://github.com/mojohaus/versions-maven-plugin/compare/versions-maven-plugin-2.10.0...versions-maven-plugin-2.11.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:versions-maven-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 36fb28932e4..8164efabfca 100644 --- a/pom.xml +++ b/pom.xml @@ -167,7 +167,7 @@ 3.2.1 3.3.2 4.7.0.0 - 2.10.0 + 2.11.0 false From 513a2cb2562ff5745b3a7e1e538a4b53759ce7ec Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 23 May 2022 16:12:24 +0200 Subject: [PATCH 7/7] Fixes #7935 - Review HTTP/2 error handling (#8048) Fixed HTTP/3 in similar way as HTTP/2. Signed-off-by: Simone Bordet --- .../jetty/http3/server/internal/HttpChannelOverHTTP3.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpChannelOverHTTP3.java b/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpChannelOverHTTP3.java index f8759b7fd45..cad2ff62837 100644 --- a/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpChannelOverHTTP3.java +++ b/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpChannelOverHTTP3.java @@ -161,13 +161,11 @@ public class HttpChannelOverHTTP3 extends HttpChannel { if (LOG.isDebugEnabled()) LOG.debug("onRequest() failure", x); - onBadMessage(x); - return null; + return () -> onBadMessage(x); } catch (Throwable x) { - onBadMessage(new BadMessageException(HttpStatus.INTERNAL_SERVER_ERROR_500, null, x)); - return null; + return () -> onBadMessage(new BadMessageException(HttpStatus.INTERNAL_SERVER_ERROR_500, null, x)); } }