Merge branch '7.0.x' into pmd7-language-lifecycle

pmd-kotlin/pom.xml

@@ -77,8 +77,8 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

pmd-kotlin/src/test/java/net/sourceforge/pmd/cpd/KotlinTokenizerTest.java

@@ -6,13 +6,13 @@ package net.sourceforge.pmd.cpd;
 
 import java.util.Properties;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
 
-public class KotlinTokenizerTest extends CpdTextComparisonTest {
+class KotlinTokenizerTest extends CpdTextComparisonTest {
 
-    public KotlinTokenizerTest() {
+    KotlinTokenizerTest() {
         super(".kt");
     }
 
@@ -27,22 +27,22 @@ public class KotlinTokenizerTest extends CpdTextComparisonTest {
     }
 
     @Test
-    public void testComments() {
+    void testComments() {
         doTest("comment");
     }
 
     @Test
-    public void testIncrement() {
+    void testIncrement() {
         doTest("increment");
     }
 
     @Test
-    public void testImportsIgnored() {
+    void testImportsIgnored() {
         doTest("imports");
     }
 
     @Test
-    public void testTabWidth() {
+    void testTabWidth() {
         doTest("tabWidth");
     }
 }

pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/ast/KotlinParserTests.java

@@ -4,15 +4,15 @@
 
 package net.sourceforge.pmd.lang.kotlin.ast;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
  */
-public class KotlinParserTests extends BaseKotlinTreeDumpTest {
+class KotlinParserTests extends BaseKotlinTreeDumpTest {
 
     @Test
-    public void testSimpleKotlin() {
+    void testSimpleKotlin() {
         doTest("Simple");
     }
 

pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/bestpractices/FunctionNameTooShortTest.java

@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.kotlin.rule.bestpractices;
 
 import net.sourceforge.pmd.testframework.PmdRuleTst;
 
-public class FunctionNameTooShortTest extends PmdRuleTst {
+class FunctionNameTooShortTest extends PmdRuleTst {
     // no additional unit tests
 }

pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java

@@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.kotlin.rule.errorprone;
 
 import net.sourceforge.pmd.testframework.PmdRuleTst;
 
-public class OverrideBothEqualsAndHashcodeTest extends PmdRuleTst {
+class OverrideBothEqualsAndHashcodeTest extends PmdRuleTst {
     // no additional unit tests
 }