diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index e7ffa71527..886e7db6d4 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -98,6 +98,7 @@ 2.0.1 1.5.6 1.2 + 1.1.0.Final 1.1.6 2.2.11 3.3.0.Final @@ -123,7 +124,7 @@ 3.5.3 2.7 1.1.8 - 1.16.10 + 1.16.12 1.4.6 6.1.0.jre8 1.10.19 @@ -937,6 +938,11 @@ javax.transaction-api ${javax-transaction.version} + + javax.validation + validation-api + ${javax-validation.version} + jaxen jaxen 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");