Merge branch '2.0.x' into 2.1.x

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json

@@ -62,4 +62,4 @@
       ]
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json

@@ -35,4 +35,4 @@
       }
     }
 	]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json

@@ -1,3 +1,3 @@
 {
   "foo": "bar"
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json

@@ -56,4 +56,4 @@
       ]
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json

@@ -20,4 +20,4 @@
       "sourceType": "org.acme.Foo2"
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json

@@ -5,4 +5,4 @@
       "sourceType": "org.acme.Invalid"
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json

@@ -76,4 +76,4 @@
       ]
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json

@@ -8,4 +8,4 @@
       "name": "spring.root2.name"
     }
   ]
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet

@@ -6,4 +6,4 @@
 
 	public void setExtra(String extra) {
 		this.extra = extra;
-	}
+	}

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script

@@ -1 +1 @@
-FOO=BAR
+FOO=BAR

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF

@@ -0,0 +1 @@
+