Merge branch '2.1.x'

Closes gh-18877
This commit is contained in:
Andy Wilkinson 2019-11-05 13:26:45 +00:00
commit 571e4640de
1 changed files with 21 additions and 11 deletions

View File

@ -128,13 +128,18 @@ The following listing shows a typical `pom.xml` file:
<version>{spring-boot-version}</version> <version>{spring-boot-version}</version>
</parent> </parent>
<!-- Override inherited license and developers --> <!-- Override inherited settings -->
<description/>
<developers>
<developer/>
</developers>
<licenses> <licenses>
<license /> <license/>
</licenses> </licenses>
<developers> <scm>
<developer /> <url/>
</developers> </scm>
<url/>
<!-- Add typical dependencies for a web application --> <!-- Add typical dependencies for a web application -->
<dependencies> <dependencies>
@ -469,12 +474,17 @@ Open your favorite text editor and add the following:
<version>{spring-boot-version}</version> <version>{spring-boot-version}</version>
</parent> </parent>
<description/>
<developers>
<developer/>
</developers>
<licenses> <licenses>
<license /> <license/>
</licenses> </licenses>
<developers> <scm>
<developer /> <url/>
</developers> </scm>
<url/>
<!-- Additional lines to be added here... --> <!-- Additional lines to be added here... -->