From 43d05315b38658f16fcd58d1d10aaf83adb213eb Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 8 Mar 2018 13:10:46 +0000
Subject: [PATCH] Use Surefire and Failsafe 2.21.0 when building with JDK 10

Closes gh-12332
---
 spring-boot-project/spring-boot-parent/pom.xml | 13 ++-----------
 spring-boot-samples/pom.xml                    | 13 ++-----------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml
index 3f041f547b..2b7aa47837 100644
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -786,19 +786,10 @@
 				<jdk>10</jdk>
 			</activation>
 			<properties>
-				<maven-failsafe-plugin.version>2.21.0-SNAPSHOT</maven-failsafe-plugin.version>
+				<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
 				<maven-site-plugin.version>3.7</maven-site-plugin.version>
-				<maven-surefire-plugin.version>2.21.0-SNAPSHOT</maven-surefire-plugin.version>
+				<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
 			</properties>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>apache-snapshots</id>
-					<url>https://repository.apache.org/content/groups/snapshots</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</pluginRepository>
-			</pluginRepositories>
 		</profile>
 	</profiles>
 </project>
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index 7a55ffe6ed..b252e4aed0 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -254,18 +254,9 @@
 				<jdk>10</jdk>
 			</activation>
 			<properties>
-				<maven-surefire-plugin.version>2.21.0-SNAPSHOT</maven-surefire-plugin.version>
-				<maven-failsafe-plugin.version>2.21.0-SNAPSHOT</maven-failsafe-plugin.version>
+				<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+				<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
 			</properties>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>apache-snapshots</id>
-					<url>https://repository.apache.org/content/groups/snapshots</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</pluginRepository>
-			</pluginRepositories>
 		</profile>
 	</profiles>
 </project>