fix #2083 use junit-bom to control dependencies

reactor · Jul 24, 2020 · d8572ee · d8572ee
1 parent eb32fa7
commit d8572ee
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,8 +66,8 @@ ext {
 	logbackVersion = '1.1.2'
 
 	// Testing
+	jUnitPlatformVersion = '5.6.0'
 	jUnitVersion = '4.13'
-	jUnitJupiterVersion = '5.6.0'
 	assertJVersion = '3.11.1'
 	mockitoVersion = '2.23.0'
 	jUnitParamsVersion = '1.1.1'

diff --git a/reactor-core/build.gradle b/reactor-core/build.gradle
@@ -75,12 +75,13 @@ dependencies {
 	//Optional JDK 9 Converter
 	jsr166backport "io.projectreactor:jsr166:$jsr166BackportVersion"
 
-	testCompile "junit:junit:$jUnitVersion"
-	testCompile "org.junit.jupiter:junit-jupiter-api:${jUnitJupiterVersion}"
-	testCompile "org.junit.platform:junit-platform-launcher:1.6.1"
-	testCompile "org.junit.jupiter:junit-jupiter-params:${jUnitJupiterVersion}"
-	testRuntime "org.junit.jupiter:junit-jupiter-engine:${jUnitJupiterVersion}"
-	testRuntime "org.junit.vintage:junit-vintage-engine:${jUnitJupiterVersion}"
+	testImplementation platform("org.junit:junit-bom:${jUnitPlatformVersion}")
+	testCompile "junit:junit:${jUnitVersion}"
+	testCompile "org.junit.jupiter:junit-jupiter-api"
+	testCompile "org.junit.platform:junit-platform-launcher"
+	testCompile "org.junit.jupiter:junit-jupiter-params"
+	testRuntime "org.junit.jupiter:junit-jupiter-engine"
+	testRuntime "org.junit.vintage:junit-vintage-engine"
 
 	testRuntime "ch.qos.logback:logback-classic:$logbackVersion"
 	// Testing

diff --git a/reactor-test/build.gradle b/reactor-test/build.gradle
@@ -40,10 +40,11 @@ dependencies {
 
 	optional "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
 
-	testCompile "junit:junit:$jUnitVersion"
-	testImplementation "org.junit.jupiter:junit-jupiter-api:${jUnitJupiterVersion}"
-	testRuntime "org.junit.jupiter:junit-jupiter-engine:${jUnitJupiterVersion}"
-	testRuntime "org.junit.vintage:junit-vintage-engine:${jUnitJupiterVersion}"
+	testImplementation platform("org.junit:junit-bom:${jUnitPlatformVersion}")
+	testCompile "junit:junit:${jUnitVersion}"
+	testImplementation "org.junit.jupiter:junit-jupiter-api"
+	testRuntime "org.junit.jupiter:junit-jupiter-engine"
+	testRuntime "org.junit.vintage:junit-vintage-engine"
 
 	testRuntime "ch.qos.logback:logback-classic:$logbackVersion"
 

diff --git a/reactor-tools/build.gradle b/reactor-tools/build.gradle
@@ -44,8 +44,9 @@ dependencies {
         javaAgentTestRuntime(dependency)
     }
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${jUnitJupiterVersion}"
-    testRuntime "org.junit.jupiter:junit-jupiter-engine:${jUnitJupiterVersion}"
+    testImplementation platform("org.junit:junit-bom:${jUnitPlatformVersion}")
+    testImplementation "org.junit.jupiter:junit-jupiter-api"
+    testRuntime "org.junit.jupiter:junit-jupiter-engine"
 
     testCompile "org.assertj:assertj-core:$assertJVersion"
     testCompile 'cglib:cglib:3.3.0'