Merge branch '2.4.x' into 2.5.x

Closes gh-28206

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/ContentFilter.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.
@@ -19,9 +19,9 @@ package org.springframework.boot.loader.tools.layer;
 /**
  * Callback interface that can be used to filter layer contents.
  *
+ * @param <T> the content type
  * @author Madhura Bhave
  * @author Phillip Webb
- * @param <T> the content type
  * @since 2.3.0
  */
 @FunctionalInterface