From d3c06ee0cffecb6f3204049ffb58fa25d93120f3 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 6 Apr 2020 21:55:52 -0700
Subject: [PATCH] Remove windows line endings when parsing index

---
 .../springframework/boot/jarmode/layertools/IndexedLayers.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/IndexedLayers.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/IndexedLayers.java
index d1e341249db..14f66f3560a 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/IndexedLayers.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/IndexedLayers.java
@@ -44,7 +44,8 @@ class IndexedLayers implements Layers {
 	private MultiValueMap<String, String> layers = new LinkedMultiValueMap<>();
 
 	IndexedLayers(String indexFile) {
-		String[] lines = Arrays.stream(indexFile.split("\n")).filter(StringUtils::hasText).toArray(String[]::new);
+		String[] lines = Arrays.stream(indexFile.split("\n")).map((line) -> line.replace("\r", ""))
+				.filter(StringUtils::hasText).toArray(String[]::new);
 		String layer = null;
 		for (String line : lines) {
 			if (line.startsWith("- ")) {