root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.1.x' 

Closes gh-18877
This commit is contained in:
Andy Wilkinson 2019-11-05 13:26:45 +00:00
parent d331f28222 bd06a91ac0
commit 571e4640de
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
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 -->
<licenses> <description/>
<license />
</licenses>
<developers> <developers>
<developer/> <developer/>
</developers> </developers>
<licenses>
<license/>
</licenses>
<scm>
<url/>
</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>
<licenses> <description/>
<license />
</licenses>
<developers> <developers>
<developer/> <developer/>
</developers> </developers>
<licenses>
<license/>
</licenses>
<scm>
<url/>
</scm>
<url/>
<!-- Additional lines to be added here... --> <!-- Additional lines to be added here... -->