From 38f112b9e1d1d0e0802bb66f802037959551ed6a Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Wed, 28 Feb 2018 18:59:45 -0800
Subject: [PATCH] Update flattened POM elements

Update flattened POM rules to satisfy maven central
requirements.

Fixes gh-12290
---
 spring-boot-project/spring-boot-dependencies/pom.xml   | 10 +++++++++-
 .../spring-boot-starter-parent/pom.xml                 |  7 +++++--
 .../src/main/xslt/post-process-flattened-pom.xsl       |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 53f184455f..0cc1d52bb2 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -22,6 +22,14 @@
 	<scm>
 		<url>https://github.com/spring-projects/spring-boot</url>
 	</scm>
+	<developers>
+		<developer>
+			<name>Pivotal</name>
+			<email>info@pivotal.io</email>
+			<organization>Pivotal Software, Inc.</organization>
+			<organizationUrl>http://www.spring.io</organizationUrl>
+		</developer>
+	</developers>
 	<properties>
 		<!-- Dependency versions -->
 		<activemq.version>5.15.3</activemq.version>
@@ -956,7 +964,7 @@
 				<artifactId>scala-support</artifactId>
 				<version>${rest-assured.version}</version>
 			</dependency>
-			 <dependency>
+			<dependency>
 				<groupId>io.rest-assured</groupId>
 				<artifactId>spring-mock-mvc</artifactId>
 				<version>${rest-assured.version}</version>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
index 33998f1e58..c9a8e67685 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -270,10 +270,13 @@
 						<configuration>
 							<updatePomFile>true</updatePomFile>
 							<pomElements>
-								<pluginManagement>keep</pluginManagement>
 								<parent>expand</parent>
-								<dependencyManagement>keep</dependencyManagement>
+								<name>keep</name>
+								<description>keep</description>
+								<url>expand</url>
 								<properties>keep</properties>
+								<pluginManagement>keep</pluginManagement>
+								<dependencyManagement>keep</dependencyManagement>
 								<build>keep</build>
 							</pomElements>
 						</configuration>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl
index a317b812da..7b7cdc494e 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl
@@ -18,4 +18,5 @@
 	<xsl:template match="/m:project/m:groupId" />
 	<xsl:template match="/m:project/m:version" />
 	<xsl:template match="/m:project/m:build/m:plugins" />
+	<xsl:template match="/m:project/m:licenses" />
 </xsl:stylesheet>