Commit abeafb32 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.1.x'

Closes gh-18877
parents 36b1f650 987a5f81
......@@ -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"]
......
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