Merge branch '2.1.x'

Closes gh-18877
This commit is contained in:
Andy Wilkinson
2019-11-05 09:42:08 +00:00

View File

@@ -128,6 +128,14 @@ The following listing shows a typical `pom.xml` file:
<version>{spring-boot-version}</version>
</parent>
<!-- Override inherited license and developers -->
<licenses>
<license />
</licenses>
<developers>
<developer />
</developers>
<!-- Add typical dependencies for a web application -->
<dependencies>
<dependency>
@@ -461,6 +469,13 @@ Open your favorite text editor and add the following:
<version>{spring-boot-version}</version>
</parent>
<licenses>
<license />
</licenses>
<developers>
<developer />
</developers>
<!-- Additional lines to be added here... -->
ifeval::["{spring-boot-artifactory-repo}" != "release"]