Merge branch '2.4.x' into 2.5.x

Closes gh-28424
2021-10-21 11:27:29 -07:00
parent a3182e453c 2f6651c3cb
commit daf36dff55
24 changed files with 37 additions and 37 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LayersIndex.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LayersIndex.java
@@ -42,7 +42,7 @@ import org.springframework.util.MultiValueMap;
 * layer.
 * <p>
 * Index files are designed to be compatible with YAML and may be read into a list of
- * `Map&lt;String, List&lt;String&gt;&gt;` instances.
+ * {@code Map<String, List<String>>} instances.
 *
 * @author Madhura Bhave
 * @author Andy Wilkinson