root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2016-10-17 17:52:29 +03:00
parent e49b5f241e 6186262ecc
commit d79546da74
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
View File

@ -400,7 +400,7 @@ want the other Boot features but not this one)
|`excludeDevtools` |`excludeDevtools`
|Boolean flag to indicate if the devtools jar should be excluded from the repackaged |Boolean flag to indicate if the devtools jar should be excluded from the repackaged
archives. Defaults to `false`. archives. Defaults to `true`.
|=== |===

6
spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
View File

@ -768,9 +768,9 @@ applied to other modules using your project. Gradle does not support `optional`
dependencies out-of-the-box so you may want to have a look to the dependencies out-of-the-box so you may want to have a look to the
{propdeps-plugin}[`propdeps-plugin`] in the meantime. {propdeps-plugin}[`propdeps-plugin`] in the meantime.
TIP: If you want to ensure that devtools is never included in a production build, you can TIP: repackaged archives do not contain devtools by default. If you want to use certain
use the `excludeDevtools` build property to completely remove the JAR. The property is remote devtools feature, you'll need to enable the `excludeDevtools` build property to
supported with both the Maven and Gradle plugins. include it. The property is supported with both the Maven and Gradle plugins.

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

@ -99,7 +99,7 @@ public class SpringBootPluginExtension {
/** /**
* Whether Spring Boot Devtools should be excluded from the fat jar. * 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 * Location of an agent jar to attach to the VM when running the application with

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

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