From a13404c67052241dca4218ee3ffae18588b18149 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Mon, 5 May 2014 12:44:30 +0100
Subject: [PATCH] Fixup POM harmonization

Fix POM harmonization so that the release process now
prepares the dependencies POM rather than starter-parent
---
 pom.xml                                         | 17 +++--------------
 spring-boot-dependencies/pom.xml                | 16 +++++++++-------
 .../spring-boot-starter-integration/pom.xml     |  1 -
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index d841ab067f5..e6df5b5b84f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
 								</configuration>
 							</execution>
 							<execution>
-								<id>fixup-starter-parent</id>
+								<id>fixup-dependencies-pom</id>
 								<phase>verify</phase>
 								<goals>
 									<goal>run</goal>
@@ -161,7 +161,7 @@
 								<inherited>false</inherited>
 								<configuration>
 									<target>
-										<property name="sourceFile" value="spring-boot-starters/spring-boot-starter-parent/pom.xml" />
+										<property name="sourceFile" value="spring-boot-dependencies/pom.xml" />
 										<xslt in="${sourceFile}" out="${sourceFile}.new" force="true">
 											<style>
 												<string><![CDATA[
@@ -177,19 +177,8 @@
 
 	<xsl:template
 		match="m:properties/m:spring-boot.version/text()">
-		<xsl:value-of select="/m:project/m:parent/m:version/text()"/>
+		<xsl:value-of select="/m:project/m:version/text()"/>
 	</xsl:template>
-
-	<xsl:template
-		match="m:dependency[m:groupId='org.springframework.boot']/m:version/text()">
-		<xsl:text>${spring-boot.version}</xsl:text>
-	</xsl:template>
-
-	<xsl:template
-		match="m:plugin[m:groupId='org.springframework.boot']/m:version/text()">
-		<xsl:text>${spring-boot.version}</xsl:text>
-	</xsl:template>
-
 </xsl:stylesheet>
 				]]>
 												</string>
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 3b051470a0f..c27389f4221 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-dependencies</artifactId>
@@ -45,8 +43,8 @@
 		</developer>
 	</developers>
 	<properties>
-		<!-- Spring Boot -->
-		<spring-boot.version>1.1.0.BUILD-SNAPSHOT</spring-boot.version>
+		<!-- Spring Boot (replaced during a full build to a real value) -->
+		<spring-boot.version>${project.version}</spring-boot.version>
 		<!-- Third Party -->
 		<activemq.version>5.7.0</activemq.version>
 		<aspectj.version>1.7.4</aspectj.version>
@@ -147,7 +145,6 @@
 				<artifactId>spring-boot-loader-tools</artifactId>
 				<version>${spring-boot.version}</version>
 			</dependency>
-
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter</artifactId>
@@ -885,6 +882,11 @@
 	<build>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<version>${spring-boot.version}</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-antrun-plugin</artifactId>
@@ -998,4 +1000,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/spring-boot-starters/spring-boot-starter-integration/pom.xml b/spring-boot-starters/spring-boot-starter-integration/pom.xml
index e69f31f49f0..63780a3babd 100644
--- a/spring-boot-starters/spring-boot-starter-integration/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-integration/pom.xml
@@ -25,7 +25,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-aop</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>