Merge branch '2.6.x' into 2.7.x

Closes gh-30450

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/CookieSameSiteSupplier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 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.
@@ -20,9 +20,6 @@
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
-/**
- * @author Phillip Webb
- */
 import javax.servlet.http.Cookie;
 
 import org.springframework.boot.web.server.Cookie.SameSite;