Merge branch '2.6.x' into 2.7.x

2022-05-26 18:13:08 +01:00
parent 455ee0ce22 3d203d0215
commit 935d1264e0
39 changed files with 112 additions and 154 deletions
--- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/applicationcontext/MyDemoBean.java
+++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/applicationcontext/MyDemoBean.java
@@ -25,6 +25,7 @@ import org.springframework.web.context.WebApplicationContext;

 public class MyDemoBean implements ApplicationListener<ApplicationStartedEvent> {

+	@SuppressWarnings("unused")
 	private ServletContext servletContext;

 	@Override