From 94afdb117d44d365e87006f43d51bc26962113e2 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 17 Jul 2020 12:03:45 +0200
Subject: [PATCH] Add test engines as surefire plugin dependencies

This removes junit-vintage-engine as a test dependency
as well as kotlintest-runner-junit5.
The engines are only needed during test execution, but should
not be available for test compilation.

For this to work, the latest surefire plugin is required.
---
 pmd-apex/pom.xml                              |  5 --
 pmd-cpp/pom.xml                               |  5 --
 pmd-cs/pom.xml                                |  5 --
 pmd-dart/pom.xml                              |  5 --
 pmd-fortran/pom.xml                           |  5 --
 pmd-go/pom.xml                                |  5 --
 pmd-groovy/pom.xml                            |  5 --
 pmd-java/pom.xml                              | 10 ---
 .../lang/java/ast/ASTCatchStatementTest.kt    |  1 -
 .../pmd/lang/java/ast/ParserTestSpec.kt       |  3 +-
 pmd-javascript/pom.xml                        |  5 --
 pmd-jsp/pom.xml                               |  5 --
 pmd-kotlin/pom.xml                            |  5 --
 pmd-lang-test/pom.xml                         |  6 --
 pmd-lua/pom.xml                               |  5 --
 pmd-matlab/pom.xml                            |  5 --
 pmd-modelica/pom.xml                          | 12 ----
 .../lang/modelica/ast/ModelicaCoordsTest.kt   |  4 +-
 pmd-objectivec/pom.xml                        |  5 --
 pmd-perl/pom.xml                              |  5 --
 pmd-php/pom.xml                               |  5 --
 pmd-plsql/pom.xml                             |  5 --
 pmd-python/pom.xml                            |  5 --
 pmd-ruby/pom.xml                              |  5 --
 pmd-scala-modules/pmd-scala-common/pom.xml    | 10 ---
 .../pmd/lang/scala/ast/ScalaTreeTests.kt      |  4 +-
 pmd-swift/pom.xml                             |  5 --
 pmd-visualforce/pom.xml                       |  5 --
 pmd-xml/pom.xml                               |  5 --
 pom.xml                                       | 61 ++++++-------------
 30 files changed, 23 insertions(+), 193 deletions(-)

diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index 67ac49220f..319268b174 100644
--- a/pmd-apex/pom.xml
+++ b/pmd-apex/pom.xml
@@ -84,11 +84,6 @@
             <artifactId>system-rules</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index b2dd19ece7..9f25873b2f 100644
--- a/pmd-cpp/pom.xml
+++ b/pmd-cpp/pom.xml
@@ -76,11 +76,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index 38a5a822be..9ed215bb18 100644
--- a/pmd-cs/pom.xml
+++ b/pmd-cs/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index f489c42d7c..e3b0d8482e 100644
--- a/pmd-dart/pom.xml
+++ b/pmd-dart/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index f5926fc80b..4a94623d7c 100644
--- a/pmd-fortran/pom.xml
+++ b/pmd-fortran/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index 2c65c6a915..311df23eeb 100644
--- a/pmd-go/pom.xml
+++ b/pmd-go/pom.xml
@@ -43,11 +43,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index e3afe3ef74..969a99e55e 100644
--- a/pmd-groovy/pom.xml
+++ b/pmd-groovy/pom.xml
@@ -40,11 +40,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 41a7476b9a..f3e4264c30 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -149,11 +149,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>com.github.stefanbirkner</groupId>
@@ -176,11 +171,6 @@
             <artifactId>tree-printers</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.kotlintest</groupId>
-            <artifactId>kotlintest-runner-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.kotlintest</groupId>
             <artifactId>kotlintest-assertions</artifactId>
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTCatchStatementTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTCatchStatementTest.kt
index 80eb0b2c3a..8c4d34181f 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTCatchStatementTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTCatchStatementTest.kt
@@ -3,7 +3,6 @@ package net.sourceforge.pmd.lang.java.ast
 import io.kotlintest.matchers.collections.shouldContainExactly
 import io.kotlintest.should
 import io.kotlintest.shouldBe
-import io.kotlintest.specs.FunSpec
 import net.sourceforge.pmd.lang.java.ast.JavaVersion.*
 import net.sourceforge.pmd.lang.java.ast.JavaVersion.Companion.Earliest
 import net.sourceforge.pmd.lang.java.ast.JavaVersion.Companion.Latest
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ParserTestSpec.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ParserTestSpec.kt
index d228c5d0d1..741b2bff65 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ParserTestSpec.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ParserTestSpec.kt
@@ -3,7 +3,6 @@ package net.sourceforge.pmd.lang.java.ast
 import io.kotlintest.AbstractSpec
 import io.kotlintest.TestContext
 import io.kotlintest.TestType
-import io.kotlintest.specs.IntelliMarker
 import net.sourceforge.pmd.lang.ast.test.Assertions
 import io.kotlintest.should as kotlintestShould
 
@@ -15,7 +14,7 @@ import io.kotlintest.should as kotlintestShould
  *
  * @author Clément Fournier
  */
-abstract class ParserTestSpec(body: ParserTestSpec.() -> Unit) : AbstractSpec(), IntelliMarker {
+abstract class ParserTestSpec(body: ParserTestSpec.() -> Unit) : AbstractSpec() {
 
     init {
         body()
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index 706f3d09cc..9bdb9e9bc8 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -94,11 +94,6 @@
             <artifactId>pmd-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-lang-test</artifactId>
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index 554324da5d..860bf37c85 100644
--- a/pmd-jsp/pom.xml
+++ b/pmd-jsp/pom.xml
@@ -82,11 +82,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
index 09c881677c..5fa13a4a8e 100644
--- a/pmd-kotlin/pom.xml
+++ b/pmd-kotlin/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index 077910a59e..6fa4a14da8 100644
--- a/pmd-lang-test/pom.xml
+++ b/pmd-lang-test/pom.xml
@@ -156,12 +156,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.kotlintest</groupId>
-            <artifactId>kotlintest-runner-junit5</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.github.oowekyala.treeutils</groupId>
             <artifactId>tree-matchers</artifactId>
diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index 2bc6f0754f..827030946b 100644
--- a/pmd-lua/pom.xml
+++ b/pmd-lua/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index 0b71aad03e..8b1824078c 100644
--- a/pmd-matlab/pom.xml
+++ b/pmd-matlab/pom.xml
@@ -76,11 +76,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml
index 02fb539322..3c3f5de689 100644
--- a/pmd-modelica/pom.xml
+++ b/pmd-modelica/pom.xml
@@ -83,11 +83,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-lang-test</artifactId>
@@ -124,11 +119,6 @@
             <artifactId>annotations</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.kotlintest</groupId>
-            <artifactId>kotlintest-runner-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.kotlintest</groupId>
             <artifactId>kotlintest-assertions</artifactId>
@@ -139,7 +129,5 @@
             <artifactId>kotlintest-core</artifactId>
             <scope>test</scope>
         </dependency>
-
-
     </dependencies>
 </project>
diff --git a/pmd-modelica/src/test/kotlin/net/sourceforge/pmd/lang/modelica/ast/ModelicaCoordsTest.kt b/pmd-modelica/src/test/kotlin/net/sourceforge/pmd/lang/modelica/ast/ModelicaCoordsTest.kt
index 6ad15f5bb4..dfa62e29b5 100644
--- a/pmd-modelica/src/test/kotlin/net/sourceforge/pmd/lang/modelica/ast/ModelicaCoordsTest.kt
+++ b/pmd-modelica/src/test/kotlin/net/sourceforge/pmd/lang/modelica/ast/ModelicaCoordsTest.kt
@@ -6,14 +6,14 @@ package net.sourceforge.pmd.lang.modelica.ast
 
 import io.kotlintest.should
 import io.kotlintest.shouldBe
-import io.kotlintest.specs.FunSpec
+import io.kotlintest.specs.AbstractFunSpec
 import net.sourceforge.pmd.lang.LanguageRegistry
 import net.sourceforge.pmd.lang.ast.Node
 import net.sourceforge.pmd.lang.ast.test.matchNode
 import net.sourceforge.pmd.lang.ast.test.shouldBe
 import java.io.StringReader
 
-class ModelicaCoordsTest : FunSpec({
+class ModelicaCoordsTest : AbstractFunSpec({
 
 
     test("Test line/column numbers for implicit nodes") {
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index dafc12b184..7606c1db5d 100644
--- a/pmd-objectivec/pom.xml
+++ b/pmd-objectivec/pom.xml
@@ -76,11 +76,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml
index 55fb10ac2b..49cc40f80a 100644
--- a/pmd-perl/pom.xml
+++ b/pmd-perl/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 3cf2f6bce6..26259bb0d6 100644
--- a/pmd-php/pom.xml
+++ b/pmd-php/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index 74f54637bb..334c8559dd 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -94,11 +94,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 42e44fa67e..c0bd0bb459 100644
--- a/pmd-python/pom.xml
+++ b/pmd-python/pom.xml
@@ -76,11 +76,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index 7c70becc38..bcebcdcd0f 100644
--- a/pmd-ruby/pom.xml
+++ b/pmd-ruby/pom.xml
@@ -22,11 +22,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml
index 751918cc7f..4304adf8c6 100644
--- a/pmd-scala-modules/pmd-scala-common/pom.xml
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -117,11 +117,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
@@ -144,11 +139,6 @@
             <artifactId>tree-printers</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.kotlintest</groupId>
-            <artifactId>kotlintest-runner-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.kotlintest</groupId>
             <artifactId>kotlintest-assertions</artifactId>
diff --git a/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt b/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt
index 21825ff9ea..32d808af26 100644
--- a/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt
+++ b/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt
@@ -5,14 +5,14 @@
 package net.sourceforge.pmd.lang.scala.ast
 
 import io.kotlintest.should
-import io.kotlintest.specs.FunSpec
+import io.kotlintest.specs.AbstractFunSpec
 import net.sourceforge.pmd.lang.LanguageRegistry
 import net.sourceforge.pmd.lang.ast.Node
 import net.sourceforge.pmd.lang.ast.test.matchNode
 import net.sourceforge.pmd.lang.ast.test.shouldBe
 import java.io.StringReader
 
-class ScalaTreeTests : FunSpec({
+class ScalaTreeTests : AbstractFunSpec({
 
 
     test("Test line/column numbers") {
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index 20c1afe4b7..f33680c761 100644
--- a/pmd-swift/pom.xml
+++ b/pmd-swift/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index b9687e9df8..c5fb203ea0 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -82,11 +82,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index bbdf4568fc..7632c6e37d 100644
--- a/pmd-xml/pom.xml
+++ b/pmd-xml/pom.xml
@@ -53,11 +53,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
diff --git a/pom.xml b/pom.xml
index bc26acb457..aa7034af50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,11 +86,12 @@
 
         <kotlin.compiler.jvmTarget>${maven.compiler.test.target}</kotlin.compiler.jvmTarget>
         <kotlin.version>1.3.0</kotlin.version>
+        <kotlintest.version>3.1.8</kotlintest.version>
         <dokka.version>0.10.1</dokka.version>
 
 
         <javacc.version>5.0</javacc.version>
-        <surefire.version>2.22.1</surefire.version>
+        <surefire.version>3.0.0-M5</surefire.version>
         <checkstyle.version>8.30</checkstyle.version>
         <checkstyle.plugin.version>3.1.1</checkstyle.plugin.version>
         <pmd.plugin.version>3.13.0</pmd.plugin.version>
@@ -259,6 +260,20 @@
                             <mvn.project.src.test.resources>${project.build.testResources[0].directory}</mvn.project.src.test.resources>
                         </systemPropertyVariables>
                     </configuration>
+                    <dependencies>
+                        <!-- Junit5 Platform Engine for Junit 3 & 4 -->
+                        <dependency>
+                            <groupId>org.junit.vintage</groupId>
+                            <artifactId>junit-vintage-engine</artifactId>
+                            <version>5.6.2</version>
+                        </dependency>
+                        <!-- Junit5 Platform Engine for Kotlin Tests -->
+                        <dependency>
+                            <groupId>io.kotlintest</groupId>
+                            <artifactId>kotlintest-runner-junit5</artifactId>
+                            <version>${kotlintest.version}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -775,40 +790,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <!-- Junit 5 Engine -->
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-api</artifactId>
-                <version>5.5.0</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>5.5.0</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.junit.platform</groupId>
-                <artifactId>junit-platform-commons</artifactId>
-                <version>1.5.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.platform</groupId>
-                <artifactId>junit-platform-launcher</artifactId>
-                <version>1.5.0</version>
-                <scope>test</scope>
-            </dependency>
-
-            <!-- Junit 3 & 4 engine -->
-            <dependency>
-                <groupId>org.junit.vintage</groupId>
-                <artifactId>junit-vintage-engine</artifactId>
-                <version>5.5.0</version>
-                <scope>test</scope>
-            </dependency>
-
             <!-- Kotlin -->
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
@@ -841,22 +822,16 @@
                 <scope>test</scope>
             </dependency>
 
-            <dependency>
-                <groupId>io.kotlintest</groupId>
-                <artifactId>kotlintest-runner-junit5</artifactId>
-                <version>3.1.8</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>io.kotlintest</groupId>
                 <artifactId>kotlintest-assertions</artifactId>
-                <version>3.1.8</version>
+                <version>${kotlintest.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>io.kotlintest</groupId>
                 <artifactId>kotlintest-core</artifactId>
-                <version>3.1.8</version>
+                <version>${kotlintest.version}</version>
                 <scope>test</scope>
             </dependency>