Merge branch '1.5.x'

spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc

@@ -61,7 +61,6 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson;
 :spring-data: https://projects.spring.io/spring-data/
 :spring-data-rest-javadoc: https://docs.spring.io/spring-data/rest/docs/current/api/org/springframework/data/rest
 :gradle-userguide: https://www.gradle.org/docs/current/userguide
-:propdeps-plugin: https://github.com/spring-projects/gradle-plugins/tree/master/propdeps-plugin
 :ant-manual: http://ant.apache.org/manual
 :code-examples: ../java/org/springframework/boot/docs
 :test-examples: ../../test/java/org/springframework/boot/docs

spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc

@@ -719,10 +719,8 @@ listings for Maven and Gradle:
 NOTE: Developer tools are automatically disabled when running a fully packaged
 application. If your application is launched from `java -jar` or if it is started from a
 special classloader, then it is considered a "`production application`". Flagging the
-dependency as optional is a best practice that prevents devtools from being transitively
-applied to other modules that use your project. Gradle does not support `optional`
-dependencies out-of-the-box, so you may want to have a look at the
-{propdeps-plugin}[`propdeps-plugin`].
+dependency as optional in Maven or using `compileOnly` in Gradle is a best practice that
+prevents devtools from being transitively applied to other modules that use your project.
 
 TIP: Repackaged archives do not contain devtools by default. If you want to use a
 <<using-boot-devtools-remote,certain remote devtools feature>>, you need to disable the