Merge branch '2.4.x' into 2.5.x

Closes gh-28206

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/RSocketServerCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -22,8 +22,8 @@ import io.rsocket.core.RSocketServer;
  * Callback interface that can be used to customize a {@link RSocketServer}.
  *
  * @author Brian Clozel
- * @see RSocketServer
  * @since 2.3.0
+ * @see RSocketServer
  */
 @FunctionalInterface
 public interface RSocketServerCustomizer {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServerCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -22,8 +22,8 @@ import org.eclipse.jetty.server.Server;
  * Callback interface that can be used to customize a Jetty {@link Server}.
  *
  * @author Dave Syer
- * @see JettyServletWebServerFactory
  * @since 2.0.0
+ * @see JettyServletWebServerFactory
  */
 @FunctionalInterface
 public interface JettyServerCustomizer {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyRouteProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -24,8 +24,8 @@ import reactor.netty.http.server.HttpServerRoutes;
  * Function that can add new routes to an {@link HttpServerRoutes} instance.
  *
  * @author Brian Clozel
- * @see NettyReactiveWebServerFactory
  * @since 2.2.0
+ * @see NettyReactiveWebServerFactory
  */
 @FunctionalInterface
 public interface NettyRouteProvider extends Function<HttpServerRoutes, HttpServerRoutes> {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyServerCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -24,8 +24,8 @@ import reactor.netty.http.server.HttpServer;
  * Mapping function that can be used to customize a Reactor Netty server instance.
  *
  * @author Brian Clozel
- * @see NettyReactiveWebServerFactory
  * @since 2.1.0
+ * @see NettyReactiveWebServerFactory
  */
 @FunctionalInterface
 public interface NettyServerCustomizer extends Function<HttpServer, HttpServer> {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatConnectorCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -22,8 +22,8 @@ import org.apache.catalina.connector.Connector;
  * Callback interface that can be used to customize a Tomcat {@link Connector}.
  *
  * @author Dave Syer
- * @see ConfigurableTomcatWebServerFactory
  * @since 2.0.0
+ * @see ConfigurableTomcatWebServerFactory
  */
 @FunctionalInterface
 public interface TomcatConnectorCustomizer {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatContextCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -22,8 +22,8 @@ import org.apache.catalina.Context;
  * Callback interface that can be used to customize a Tomcat {@link Context}.
  *
  * @author Dave Syer
- * @see TomcatServletWebServerFactory
  * @since 2.0.0
+ * @see TomcatServletWebServerFactory
  */
 @FunctionalInterface
 public interface TomcatContextCustomizer {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatProtocolHandlerCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -25,8 +25,8 @@ import org.apache.coyote.ProtocolHandler;
  *
  * @param <T> specified type for customization based on {@link ProtocolHandler}
  * @author Pascal Zwick
- * @see ConfigurableTomcatWebServerFactory
  * @since 2.2.0
+ * @see ConfigurableTomcatWebServerFactory
  */
 @FunctionalInterface
 public interface TomcatProtocolHandlerCustomizer<T extends ProtocolHandler> {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -23,8 +23,8 @@ import org.springframework.boot.web.servlet.ServletContextInitializer;
  * Factory interface that can be used to create a {@link WebServer}.
  *
  * @author Phillip Webb
- * @see WebServer
  * @since 2.0.0
+ * @see WebServer
  */
 @FunctionalInterface
 public interface ServletWebServerFactory {