From c11e5147678883c0a2fe31103db0981372e7e84b Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Wed, 1 Nov 2017 22:57:51 -0700
Subject: [PATCH] Allow individual builds of invoker plugin projects

Clean `${revision}` variables when running invoker based integration
tests. Prior to this commit some `${revision}` placeholders remained
in the invoker local repository preventing the project from being built
outside of the reactor.

Fixes gh-10667
---
 .../spring-boot-loader/pom.xml                | 45 ++++++++++++++++---
 .../spring-boot-maven-plugin/pom.xml          | 45 ++++++++++++++++---
 2 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml
index e7720fdbaa..4c5d8b7bab 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml
@@ -61,21 +61,52 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-invoker-plugin</artifactId>
 						<configuration>
-							<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-							<settingsFile>src/it/settings.xml</settingsFile>
 							<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-							<postBuildHookScript>verify</postBuildHookScript>
-							<addTestClassPath>true</addTestClassPath>
-							<skipInvocation>${skipTests}</skipInvocation>
-							<streamLogs>true</streamLogs>
 						</configuration>
 						<executions>
 							<execution>
-								<id>integration-test</id>
+								<id>prepare-integration-test</id>
+								<phase>pre-integration-test</phase>
 								<goals>
 									<goal>install</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>integration-test</id>
+								<goals>
 									<goal>run</goal>
 								</goals>
+								<configuration>
+									<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+									<settingsFile>src/it/settings.xml</settingsFile>
+									<postBuildHookScript>verify</postBuildHookScript>
+									<addTestClassPath>true</addTestClassPath>
+									<skipInvocation>${skipTests}</skipInvocation>
+									<streamLogs>true</streamLogs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>cleanup-local-integration-repo</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<replaceregexp match="\$\{revision\}" replace="${project.version}"
+											flags="g" byline="true">
+											<fileset
+												dir="${project.build.directory}/local-repo/org/springframework/boot/"
+												includes="**/*.pom" />
+										</replaceregexp>
+									</target>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml
index 681bc5832f..da06cd9760 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml
@@ -125,21 +125,52 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-invoker-plugin</artifactId>
 						<configuration>
-							<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-							<settingsFile>src/it/settings.xml</settingsFile>
 							<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-							<postBuildHookScript>verify</postBuildHookScript>
-							<addTestClassPath>true</addTestClassPath>
-							<skipInvocation>${skipTests}</skipInvocation>
-							<streamLogs>true</streamLogs>
 						</configuration>
 						<executions>
 							<execution>
-								<id>integration-test</id>
+								<id>prepare-integration-test</id>
+								<phase>pre-integration-test</phase>
 								<goals>
 									<goal>install</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>integration-test</id>
+								<goals>
 									<goal>run</goal>
 								</goals>
+								<configuration>
+									<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+									<settingsFile>src/it/settings.xml</settingsFile>
+									<postBuildHookScript>verify</postBuildHookScript>
+									<addTestClassPath>true</addTestClassPath>
+									<skipInvocation>${skipTests}</skipInvocation>
+									<streamLogs>true</streamLogs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>cleanup-local-integration-repo</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<replaceregexp match="\$\{revision\}" replace="${project.version}"
+											flags="g" byline="true">
+											<fileset
+												dir="${project.build.directory}/local-repo/org/springframework/boot/"
+												includes="**/*.pom" />
+										</replaceregexp>
+									</target>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>