From a99582a3bb9073cd15d22fcbcfabca56ba28ea80 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:06 +0100 Subject: [PATCH] Upgrade to Jetty 9.4.45.v20220203 Closes gh-29771 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../smoketest/jetty/jsp/SampleWebJspApplicationTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 4307975740..0c28371393 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -899,7 +899,7 @@ bom { ] } } - library("Jetty", "9.4.44.v20210927") { + library("Jetty", "9.4.45.v20220203") { prohibit("[11.0.0-alpha0,)") { because "it uses the jakarta.* namespace" } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java index 22dd4b5882..359b8ec26c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ class SampleWebJspApplicationTests { JettyServerCustomizer jettyServerCustomizer() { return (server) -> { ContextHandler handler = (ContextHandler) server.getHandler(); - handler.addAliasCheck(new ContextHandler.ApproveAliases()); + handler.addAliasCheck((path, resource) -> true); }; }