Merge branch '2.4.x' into 2.5.x

Closes gh-28206

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/ContextConsumer.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,9 +22,9 @@ import org.springframework.context.ApplicationContext;
  * Callback interface used to process an {@link ApplicationContext} with the ability to
  * throw a (checked) exception.
  *
+ * @param <C> the application context type
  * @author Stephane Nicoll
  * @author Andy Wilkinson
- * @param <C> the application context type
  * @since 2.0.0
  * @see AbstractApplicationContextRunner
  */