Merge branch '1.5.x'

spring-boot-dependencies/pom.xml

@@ -98,6 +98,7 @@
 		<javax-jms.version>2.0.1</javax-jms.version>
 		<javax-mail.version>1.5.6</javax-mail.version>
 		<javax-transaction.version>1.2</javax-transaction.version>
+		<javax-validation.version>1.1.0.Final</javax-validation.version>
 		<jaxen.version>1.1.6</jaxen.version>
 		<jaybird.version>2.2.11</jaybird.version>
 		<jboss-logging.version>3.3.0.Final</jboss-logging.version>
@@ -123,7 +124,7 @@
 		<liquibase.version>3.5.3</liquibase.version>
 		<log4j2.version>2.7</log4j2.version>
 		<logback.version>1.1.8</logback.version>
-		<lombok.version>1.16.10</lombok.version>
+		<lombok.version>1.16.12</lombok.version>
 		<mariadb.version>1.4.6</mariadb.version>
 		<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>
 		<mockito.version>1.10.19</mockito.version>
@@ -937,6 +938,11 @@
 				<artifactId>javax.transaction-api</artifactId>
 				<version>${javax-transaction.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.validation</groupId>
+				<artifactId>validation-api</artifactId>
+				<version>${javax-validation.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>jaxen</groupId>
 				<artifactId>jaxen</artifactId>

spring-boot-docs/src/main/asciidoc/deployment.adoc

@@ -598,6 +598,12 @@ The following property substitutions are supported with the default script:
 |The `Provides` section of "`INIT INFO`". Defaults to `spring-boot-application` for Gradle
  and to `${project.artifactId}` for Maven.
 
+|`initInfoRequiredStart`
+|The `Required-Start` section of "`INIT INFO`". Defaults to `$remote_fs $syslog $network`.
+
+|`initInfoRequiredStop`
+|The `Required-Stop` section of "`INIT INFO`". Defaults to `$remote_fs $syslog $network`.
+
 |`initInfoShortDescription`
 |The `Short-Description` section of "`INIT INFO`". Defaults to `Spring Boot Application`
 for Gradle and to `${project.name}` for Maven.

spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script

@@ -11,8 +11,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          {{initInfoProvides:spring-boot-application}}
-# Required-Start:    $remote_fs $syslog $network
-# Required-Stop:     $remote_fs $syslog $network
+# Required-Start:    {{initInfoRequiredStart:$remote_fs $syslog $network}}
+# Required-Stop:     {{initInfoRequiredStop:$remote_fs $syslog $network}}
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: {{initInfoShortDescription:Spring Boot Application}}

spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/DefaultLaunchScriptTests.java

@@ -61,6 +61,16 @@ public class DefaultLaunchScriptTests {
 		assertThatPlaceholderCanBeReplaced("initInfoProvides");
 	}
 
+	@Test
+	public void initInfoRequiredStartCanBeReplaced() throws Exception {
+		assertThatPlaceholderCanBeReplaced("initInfoRequiredStart");
+	}
+
+	@Test
+	public void initInfoRequiredStopCanBeReplaced() throws Exception {
+		assertThatPlaceholderCanBeReplaced("initInfoRequiredStop");
+	}
+
 	@Test
 	public void initInfoShortDescriptionCanBeReplaced() throws Exception {
 		assertThatPlaceholderCanBeReplaced("initInfoShortDescription");