Merge branch '2.1.x'

Closes gh-18877

Author: wilkinsona

spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc

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