Skip to content

S
spring-boot
Commit 571e4640 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.1.x' 

Closes gh-18877
parents d331f282 bd06a91a
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 11 deletions
spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
View file @ 571e4640
...@@ -128,13 +128,18 @@ The following listing shows a typical `pom.xml` 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: ...@@ -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... -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment