ENT-3422 Add JUnit 5 dependencies to all projects (#5084)

* ENT-3422 Add JUnit 5 dependencies to all projects

* Remove explicit junit 4 imports where not needed

* Minor PR fixes

* Limit import scope

build.gradle

@@ -38,7 +38,14 @@ buildscript {
     ext.netty_version = '4.1.22.Final'
     ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion")
     ext.fileupload_version = '1.3.3'
+    // Legacy JUnit 4 version
     ext.junit_version = '4.12'
+    // Need this version to access classpath scanning error handling fix -
+    // see https://github.com/junit-team/junit5/commit/389de48c2a18c5a93a7203ef424aa47a8a835a74
+    // Upgrade to 5.5.x when GA release is available.
+    ext.junit_vintage_version = '5.5.0-M1'
+    ext.junit_jupiter_version = '5.5.0-M1'
+    ext.junit_platform_version = '1.4.2'
     ext.mockito_version = '2.18.3'
     ext.mockito_kotlin_version = '1.5.0'
     ext.hamkrest_version = '1.4.2.2'
@@ -461,6 +468,8 @@ if (file('corda-docs-only-build').exists() || (System.getenv('CORDA_DOCS_ONLY_BU
     }
 }
 
+
+
 wrapper {
     gradleVersion = "4.10.1"
     distributionType = Wrapper.DistributionType.ALL

client/jackson/build.gradle

@@ -18,8 +18,15 @@ dependencies {
 
     testCompile project(':test-utils')
     testCompile project(path: ':core', configuration: 'testArtifacts')
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    testCompile "junit:junit:$junit_version"
+    
 }
 
 jar {

client/jfx/build.gradle

@@ -44,7 +44,12 @@ dependencies {
     compile "org.apache.activemq:artemis-core-client:${artemis_version}"
 
     // Unit testing helpers.
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
     testCompile project(':test-utils')

client/mock/build.gradle

@@ -13,8 +13,13 @@ dependencies {
     compile project(':finance:workflows')
     compile project(':finance:contracts')
 
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     // Unit testing helpers.
-    testCompile "junit:junit:$junit_version"
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
     testCompile project(':test-utils')

client/rpc/build.gradle

@@ -74,9 +74,14 @@ dependencies {
     // For caches rather than guava
     compile "com.github.ben-manes.caffeine:caffeine:$caffeine_version"
 
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     // Unit testing helpers.
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    testCompile "junit:junit:$junit_version"
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
     testCompile project(':node-driver')

common/configuration-parsing/build.gradle

@@ -10,9 +10,14 @@ dependencies {
     compile group: "com.typesafe", name: "config", version: typesafe_config_version
 
     compile project(":common-validation")
+    
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testCompile "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 
     testCompile group: "org.jetbrains.kotlin", name: "kotlin-test", version: kotlin_version
-    testCompile group: "junit", name: "junit", version: junit_version
     testCompile group: "org.assertj", name: "assertj-core", version: assertj_version
 }
 

confidential-identities/build.gradle

@@ -12,7 +12,11 @@ dependencies {
     cordaCompile project(':core')
 
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 
     // Guava: Google test library (collections test suite)
     testCompile "com.google.guava:guava-testlib:$guava_version"

core-deterministic/testing/data/build.gradle

@@ -12,7 +12,12 @@ dependencies {
 
     testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     testCompile "org.jetbrains.kotlin:kotlin-reflect"
-    testCompile "junit:junit:$junit_version"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 }
 
 jar.enabled = false

core-deterministic/testing/verifier/build.gradle

@@ -21,6 +21,7 @@ dependencies {
     // Compile against the deterministic artifacts to ensure that we use only the deterministic API subset.
     compileOnly configurations.deterministicArtifacts
     api "junit:junit:$junit_version"
+    api "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
 }
 
 jar {

core/build.gradle

@@ -54,7 +54,12 @@ processSmokeTestResources {
 }
 
 dependencies {
-    testCompile "junit:junit:$junit_version"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "commons-fileupload:commons-fileupload:$fileupload_version"
 
     // Guava: Google test library (collections test suite)
@@ -87,9 +92,14 @@ dependencies {
     compile "com.github.ben-manes.caffeine:caffeine:$caffeine_version"
 
     // Smoke tests do NOT have any Node code on the classpath!
+    smokeTestImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    smokeTestCompile "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    smokeTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    smokeTestRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     smokeTestCompile project(':smoke-test-utils')
     smokeTestCompile "org.assertj:assertj-core:${assertj_version}"
-    smokeTestCompile "junit:junit:$junit_version"
 
     // RxJava: observable streams of events.
     compile "io.reactivex:rxjava:$rxjava_version"

djvm/djvm/build.gradle

@@ -33,9 +33,10 @@ dependencies {
 
     // ClassGraph: classpath scanning
     shadow "io.github.classgraph:classgraph:$class_graph_version"
+    
+    testCompile "junit:junit:${junit_version}"
 
     // Test utilities
-    testImplementation "junit:junit:$junit_version"
     testImplementation "org.assertj:assertj-core:$assertj_version"
     testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
     jdkRt "net.corda:deterministic-rt:latest.integration"

experimental/avalanche/build.gradle

@@ -8,7 +8,12 @@ apply plugin: 'com.github.johnrengelman.shadow'
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "info.picocli:picocli:$picocli_version"
-    testCompile "junit:junit:$junit_version"
+    
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 }
 
 jar.enabled = false

experimental/behave/build.gradle

@@ -64,8 +64,12 @@ dependencies {
     compile project(':client:rpc')
 
     // Unit Tests
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
 
-    testCompile "junit:junit:$junit_version"
+    testCompile "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.assertj:assertj-core:$assertj_version"
 
     // Scenarios / End-to-End Tests

experimental/build.gradle

@@ -20,6 +20,10 @@ dependencies {
 
     compile "com.google.guava:guava:$guava_version"
 
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
     testCompile project(':node-driver')
 }

experimental/corda-utils/build.gradle

@@ -23,5 +23,9 @@ dependencies {
     testCompile project(':test-utils')
     testCompile project(':node-driver')
 
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 }

finance/contracts/build.gradle

@@ -14,7 +14,11 @@ dependencies {
 
     testCompile project(':test-utils')
     testCompile project(path: ':core', configuration: 'testArtifacts')
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 
     // AssertJ: for fluent assertions for testing
     testCompile "org.assertj:assertj-core:$assertj_version"

finance/workflows/build.gradle

@@ -36,7 +36,12 @@ dependencies {
     
     testCompile project(':test-utils')
     testCompile project(path: ':core', configuration: 'testArtifacts')
-    testCompile "junit:junit:$junit_version"
+    
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 
     // AssertJ: for fluent assertions for testing
     testCompile "org.assertj:assertj-core:$assertj_version"

node-api/build.gradle

@@ -38,8 +38,12 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     runtime 'com.mattbertolini:liquibase-slf4j:2.0.0'
 
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
     // Unit testing helpers.
-    testCompile "junit:junit:$junit_version"
     testCompile "org.assertj:assertj-core:$assertj_version"
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testCompile project(':node-driver')

node/build.gradle

@@ -128,8 +128,13 @@ dependencies {
     // TypeSafe Config: for simple and human friendly config files.
     compile "com.typesafe:config:$typesafe_config_version"
 
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     // Unit testing helpers.
-    testCompile "junit:junit:$junit_version"
     testCompile "org.assertj:assertj-core:${assertj_version}"
     testCompile project(':test-utils')
     testCompile project(':client:jfx')

samples/attachment-demo/build.gradle

@@ -54,7 +54,13 @@ dependencies {
         // and we don't need another one.
         exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
     }
-    testCompile "junit:junit:$junit_version"
+    
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.assertj:assertj-core:$assertj_version"
 
     integrationTestCompile project(':webserver')

samples/bank-of-corda-demo/build.gradle

@@ -25,7 +25,11 @@ dependencies {
     compile "org.glassfish.jersey.core:jersey-server:${jersey_version}"
 
     // Test dependencies
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 }
 
 def nodeTask = tasks.getByPath(':node:capsule:assemble')

samples/irs-demo/build.gradle

@@ -69,7 +69,13 @@ dependencies {
     }
 
     testCompile project(':node-driver')
-    testCompile "junit:junit:$junit_version"
+    
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
     integrationTestCompile project(path: ":samples:irs-demo:web", configuration: "demoArtifacts")

samples/irs-demo/cordapp/contracts-irs/build.gradle

@@ -11,7 +11,11 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
 
     testCompile project(':node-driver')
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 }
 
 cordapp {

samples/irs-demo/cordapp/workflows-irs/build.gradle

@@ -24,7 +24,13 @@ dependencies {
     compile group: 'commons-io', name: 'commons-io', version: '2.5'
 
     testCompile project(':node-driver')
-    testCompile "junit:junit:$junit_version"
+    
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
     cordapp project(':samples:irs-demo:cordapp:contracts-irs')

samples/simm-valuation-demo/build.gradle

@@ -58,7 +58,13 @@ dependencies {
 
     // Test dependencies
     testCompile project(':node-driver')
-    testCompile "junit:junit:$junit_version"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.assertj:assertj-core:$assertj_version"
 }
 

samples/trader-demo/build.gradle

@@ -55,7 +55,13 @@ dependencies {
         // and we don't need another one.
         exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
     }
-    testCompile "junit:junit:$junit_version"
+    
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.assertj:assertj-core:$assertj_version"
 }
 

samples/trader-demo/workflows-trader/build.gradle

@@ -11,7 +11,13 @@ dependencies {
     cordapp project(':finance:workflows')
     
     testCompile project(':node-driver')
-    testCompile "junit:junit:$junit_version"
+    
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.assertj:assertj-core:$assertj_version"
 }
 

serialization/build.gradle

@@ -28,8 +28,12 @@ dependencies {
     // For caches rather than guava
     compile "com.github.ben-manes.caffeine:caffeine:$caffeine_version"
 
-    // Unit testing helpers.
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.assertj:assertj-core:$assertj_version"
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testCompile project(':node-driver')

testing/node-driver/build.gradle

@@ -29,7 +29,11 @@ dependencies {
 
     // Integration test helpers
     testCompile "org.assertj:assertj-core:$assertj_version"
-    integrationTestCompile "junit:junit:$junit_version"
+    integrationTestImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    integrationTestImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    integrationTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    integrationTestRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 
     // Jetty dependencies for NetworkMapClient test.
     // Web stuff: for HTTP[S] servlets

testing/test-cli/build.gradle

@@ -7,7 +7,13 @@ dependencies {
     compile group: "com.fasterxml.jackson.dataformat", name: "jackson-dataformat-yaml", version: "2.9.0"
     compile group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.9.0"
     compile "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.+"
-    compile "junit:junit:$junit_version"
+    
+    compile "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+    compile "junit:junit:${junit_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 
 }
 compileKotlin {

testing/test-common/build.gradle

@@ -9,7 +9,12 @@ dependencies {
     compile project(":common-logging")
 
     // Unit testing helpers.
-    compile "junit:junit:$junit_version"
+    compile "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     compile 'org.hamcrest:hamcrest-library:1.3'
     compile "com.nhaarman:mockito-kotlin:$mockito_kotlin_version"
     compile "org.mockito:mockito-core:$mockito_version"

tools/demobench/build.gradle

@@ -74,7 +74,12 @@ dependencies {
     testCompile project(':test-utils')
     testCompile project(':webserver')
 
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testCompile "org.assertj:assertj-core:$assertj_version"
 }

tools/explorer/build.gradle

@@ -7,8 +7,14 @@ mainClassName = 'net.corda.explorer.Main'
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testCompile "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    testCompile "junit:junit:$junit_version"
 
     // TornadoFX: A lightweight Kotlin framework for working with JavaFX UI's.
     compile 'no.tornado:tornadofx:1.5.9'

tools/shell/build.gradle

@@ -54,8 +54,13 @@ dependencies {
     // For logging, required for ANSIProgressRenderer.
     compile "org.apache.logging.log4j:log4j-core:$log4j_version"
 
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
+    
     // Unit testing helpers.
-    testCompile "junit:junit:$junit_version"
     testCompile "org.assertj:assertj-core:$assertj_version"
     testCompile project(':test-utils')
     testCompile project(':finance:contracts')

tools/worldmap/build.gradle

@@ -4,5 +4,9 @@ dependencies {
     implementation project(':core')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 }

webserver/build.gradle

@@ -61,7 +61,12 @@ dependencies {
     compileOnly "co.paralleluniverse:capsule:$capsule_version"
 
     integrationTestCompile project(':node-driver')
-    testCompile "junit:junit:$junit_version"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
+
+    testImplementation "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 }
 
 task integrationTest(type: Test) {