Merge branch '2.0.x' into 2.1.x

Author: wilkinsona

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

@@ -142,9 +142,12 @@ public void dependencyResolutionWithCustomClassLoader() {
 	public void resolutionWithCustomResolver() {
 		Map<String, Object> args = new HashMap<>();
 		AetherGrapeEngine grapeEngine = this.createGrapeEngine();
-		grapeEngine
-				.addResolver(createResolver("restlet.org", "https://maven.restlet.org"));
-		grapeEngine.grab(args, createDependency("org.restlet", "org.restlet", "1.1.6"));
+		grapeEngine.addResolver(
+				createResolver("spring-releases", "https://repo.spring.io/release"));
+		Map<String, Object> dependency = createDependency("io.spring.docresources",
+				"spring-doc-resources", "0.1.1.RELEASE");
+		dependency.put("ext", "zip");
+		grapeEngine.grab(args, dependency);
 		assertThat(this.groovyClassLoader.getURLs().length).isEqualTo(1);
 	}