Merge branch '1.5.x'

spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java

@@ -99,7 +99,7 @@ public class SpringBootPluginExtension {
 	/**
 	 * Whether Spring Boot Devtools should be excluded from the fat jar.
 	 */
-	boolean excludeDevtools = false;
+	boolean excludeDevtools = true;
 
 	/**
 	 * Location of an agent jar to attach to the VM when running the application with

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

@@ -167,11 +167,11 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 	private Properties embeddedLaunchScriptProperties;
 
 	/**
-	 * Exclude Spring Boot devtools.
+	 * Exclude Spring Boot devtools from the repackaged archive.
 	 * @since 1.3
 	 */
-	@Parameter(defaultValue = "false")
-	private boolean excludeDevtools;
+	@Parameter(defaultValue = "true")
+	private boolean excludeDevtools = true;
 
 	/**
 	 * Include system scoped dependencies.