Merge branch '5.1.x'

Author: snicoll

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultReturnValueHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,8 +96,8 @@ public void listenableFuture() throws Exception {
 
 	@Test
 	public void completableFuture() throws Exception {
-		SettableListenableFuture<String> future = new SettableListenableFuture<>();
-		testHandle(future, CompletableFuture.class, () -> future.set("foo"), "foo");
+		CompletableFuture<String> future = new CompletableFuture<>();
+		testHandle(future, CompletableFuture.class, () -> future.complete("foo"), "foo");
 	}
 
 	@Test
@@ -115,9 +115,9 @@ public void listenableFutureWithError() throws Exception {
 
 	@Test
 	public void completableFutureWithError() throws Exception {
-		SettableListenableFuture<String> future = new SettableListenableFuture<>();
+		CompletableFuture<String> future = new CompletableFuture<>();
 		IllegalStateException ex = new IllegalStateException();
-		testHandle(future, CompletableFuture.class, () -> future.setException(ex), ex);
+		testHandle(future, CompletableFuture.class, () -> future.completeExceptionally(ex), ex);
 	}
 
 

src/docs/asciidoc/core/core-beans.adoc

@@ -5952,13 +5952,27 @@ how to do so with Maven:
 	</dependencies>
 ----
 
-The following example shows how to do so with Gradle:
+With Gradle 4.5 and earlier, the dependency should be declared in the `compileOnly`
+configuration, as shown in the following example:
 
 [source,groovy,indent=0]
 [subs="verbatim,quotes,attributes"]
 ----
 	dependencies {
-		compileOnly("org.springframework:spring-context-indexer:{spring-version}")
+		compileOnly "org.springframework:spring-context-indexer:{spring-version}"
+	}
+----
+====
+
+With Gradle 4.6 and later, the dependency should be declared in the `annotationProcessor`
+configuration, as shown in the following example:
+
+====
+[source,groovy,indent=0]
+[subs="verbatim,quotes,attributes"]
+----
+	dependencies {
+		annotationProcessor "org.springframework:spring-context-indexer:{spring-version}"
 	}
 ----