From 1d8783b5b3822f47561fe3be8316c11196d8f497 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 15 Dec 2016 14:10:45 +0100
Subject: [PATCH 1/3] Add dependency management for javax.validation

Closes gh-7641
---
 spring-boot-dependencies/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index f78fb7aad2..18a9b3c7ac 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -100,6 +100,7 @@
 		<javax-cache.version>1.0.0</javax-cache.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>
@@ -997,6 +998,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>

From 4ce91a5366086ab2b837ca6dcb77708b0487fb1c Mon Sep 17 00:00:00 2001
From: Raja Dilip Kolli <rajadileepkolli@users.noreply.github.com>
Date: Wed, 7 Dec 2016 20:30:33 +0530
Subject: [PATCH 2/3] Upgrade to Lombok 1.16.12

Closes gh-7590
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 18a9b3c7ac..b6c505a84f 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -127,7 +127,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.jre7</mssql-jdbc.version>
 		<mockito.version>1.10.19</mockito.version>

From dd7d81a580c3b00cfa5ba2621b22d3208ec2511a Mon Sep 17 00:00:00 2001
From: Alessandro Falappa <alex.falappa@gmail.com>
Date: Fri, 2 Dec 2016 11:04:18 +0100
Subject: [PATCH 3/3] INIT INFO Required Start/Stop as embedded launch script
 properties

Expose the Required-Start and Require-Stop lines in the launch script
INIT INFO section as customizable embedded launch script properties.

This way one can express dependencies fron other init services by simply
changing the configuration in the build script.

Closes gh-7555
---
 spring-boot-docs/src/main/asciidoc/deployment.adoc     |  6 ++++++
 .../springframework/boot/loader/tools/launch.script    |  4 ++--
 .../boot/loader/tools/DefaultLaunchScriptTests.java    | 10 ++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc
index 4a532a3b71..714efaf4ce 100644
--- a/spring-boot-docs/src/main/asciidoc/deployment.adoc
+++ b/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.
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script b/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script
index 502fc0b36e..84cadd780a 100755
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script
+++ b/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}}
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/DefaultLaunchScriptTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/DefaultLaunchScriptTests.java
index d7491ff52b..278acaa6f8 100644
--- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/DefaultLaunchScriptTests.java
+++ b/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");