Merge branch 'master' of https://github.com/spring-projects/sts4

headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java

@@ -52,7 +52,7 @@ public class ManifestYmlSchema implements YamlSchema {
 	public final AbstractType t_route_string;
 
 	private static final Set<String> TOPLEVEL_EXCLUDED = ImmutableSet.of(
-		"name", "host", "hosts"
+		"name", "host", "hosts", "routes"
 	);
 
 	@Override

headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java

@@ -291,8 +291,8 @@ public class ManifestYamlEditorTest {
 				// ---------------
 				"random-route: <*>",
 				// ---------------
-				"routes:\n"+
-				"- route: <*>",
+//				"routes:\n"+
+//				"- route: <*>",
 				// ---------------
 				"services:\n"+
 				"- <*>",

headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchemaTest.java

@@ -82,7 +82,7 @@ public class ManifestYmlSchemaTest {
 			"no-route",
 			"path",
 			"random-route",
-			"routes",
+//			"routes",
 			"services",
 			"stack",
 			"timeout"