From 1dc08fdda2ec01ec00b40322fdff463a6478b849 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 11 Sep 2017 20:21:21 +0200
Subject: [PATCH] Polish "Provide dependency management for JUnit Jupiter"

Closes gh-10240
---
 spring-boot-dependencies/pom.xml              | 23 +++++++++++--------
 .../spring-boot-sample-junit-jupiter/pom.xml  |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 10f660c357..9e7a71f795 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -124,8 +124,8 @@
 		<jstl.version>1.2</jstl.version>
 		<jtds.version>1.3.1</jtds.version>
 		<junit.version>4.12</junit.version>
-		<junit.jupiter.version>5.0.0</junit.jupiter.version>
-		<junit.platform.version>1.0.0</junit.platform.version>
+		<junit-jupiter.version>5.0.0</junit-jupiter.version>
+		<junit-platform.version>1.0.0</junit-platform.version>
 		<lettuce.version>5.0.0.RC2</lettuce.version>
 		<liquibase.version>3.5.3</liquibase.version>
 		<log4j2.version>2.9.0</log4j2.version>
@@ -933,20 +933,25 @@
 				<artifactId>junit</artifactId>
 				<version>${junit.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.junit.platform</groupId>
-				<artifactId>junit-platform-launcher</artifactId>
-				<version>${junit.platform.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.junit.jupiter</groupId>
 				<artifactId>junit-jupiter-api</artifactId>
-				<version>${junit.jupiter.version}</version>
+				<version>${junit-jupiter.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.junit.jupiter</groupId>
 				<artifactId>junit-jupiter-engine</artifactId>
-				<version>${junit.jupiter.version}</version>
+				<version>${junit-jupiter.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.junit.platform</groupId>
+				<artifactId>junit-platform-engine</artifactId>
+				<version>${junit-platform.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.junit.platform</groupId>
+				<artifactId>junit-platform-launcher</artifactId>
+				<version>${junit-platform.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>mysql</groupId>
diff --git a/spring-boot-samples/spring-boot-sample-junit-jupiter/pom.xml b/spring-boot-samples/spring-boot-sample-junit-jupiter/pom.xml
index e20bbbe905..77c84c3bd3 100644
--- a/spring-boot-samples/spring-boot-sample-junit-jupiter/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-junit-jupiter/pom.xml
@@ -68,7 +68,7 @@
 					<dependency>
 						<groupId>org.junit.platform</groupId>
 						<artifactId>junit-platform-surefire-provider</artifactId>
-						<version>${junit.platform.version}</version>
+						<version>${junit-platform.version}</version>
 					</dependency>
 				</dependencies>
 			</plugin>