From 1144eb4e62231571d38c892838223ab5c1b87813 Mon Sep 17 00:00:00 2001
From: Michael Schieder <michael.schieder@gmail.com>
Date: Mon, 22 Mar 2021 14:24:21 +0100
Subject: [PATCH] Fix for #2235: extTest: added junitJupiterEngine and
 junitVintageEngine to run existing junit4+5 tests

---
 gradle/dependencies.gradle         | 1 +
 subprojects/extTest/extTest.gradle | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 12f99897a3..c1dd1d384f 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -12,6 +12,7 @@ libraries.junit4 = 'junit:junit:4.13.2'
 libraries.junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${versions.junitJupiter}"
 libraries.junitPlatformLauncher = 'org.junit.platform:junit-platform-launcher:1.7.1'
 libraries.junitJupiterEngine = "org.junit.jupiter:junit-jupiter-engine:${versions.junitJupiter}"
+libraries.junitVintageEngine = "org.junit.vintage:junit-vintage-engine:${versions.junitJupiter}"
 libraries.assertj = 'org.assertj:assertj-core:3.19.0'
 libraries.hamcrest = 'org.hamcrest:hamcrest-core:2.2'
 libraries.opentest4j = 'org.opentest4j:opentest4j:1.2.0'
diff --git a/subprojects/extTest/extTest.gradle b/subprojects/extTest/extTest.gradle
index 35b9811af8..61c26c1d67 100644
--- a/subprojects/extTest/extTest.gradle
+++ b/subprojects/extTest/extTest.gradle
@@ -14,6 +14,12 @@ dependencies {
     testCompile libraries.junit4
     testCompile libraries.assertj
     testCompile libraries.junitJupiterApi
+    testRuntime libraries.junitJupiterEngine
+    testRuntime libraries.junitVintageEngine
+}
+
+tasks.withType(Test) {
+    useJUnitPlatform()
 }
 
 configurations.all {