From 7f9fd042fb38a390d9835bae119c8764d2066c18 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:52 +0100 Subject: [PATCH] Upgrade to Undertow 2.2.24.Final Closes gh-35541 --- .../web/embedded/UndertowWebServerFactoryCustomizer.java | 3 ++- .../web/embedded/UndertowWebServerFactoryCustomizerTests.java | 1 + spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java index 8f291b1a22..f8bca9b754 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2023 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. @@ -85,6 +85,7 @@ public class UndertowWebServerFactoryCustomizer map.from(this::getOrDeduceUseForwardHeaders).to(factory::setUseForwardHeaders); } + @SuppressWarnings("deprecation") private void mapUndertowProperties(ConfigurableUndertowWebServerFactory factory, ServerOptions serverOptions) { PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); Undertow properties = this.serverProperties.getUndertow(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java index 7b544fb3e6..1e070451e4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java @@ -150,6 +150,7 @@ class UndertowWebServerFactoryCustomizerTests { } @Test + @SuppressWarnings("deprecation") void allowEncodedSlashes() { bind("server.undertow.allow-encoded-slash=true"); assertThat(boundServerOption(UndertowOptions.ALLOW_ENCODED_SLASH)).isTrue(); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 321bbd3506..71066ce8b4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1882,7 +1882,7 @@ bom { ] } } - library("Undertow", "2.2.20.Final") { + library("Undertow", "2.2.24.Final") { group("io.undertow") { modules = [ "undertow-core",