Merge branch 'master' into 7.0.x

2020-08-03 23:03:44 +02:00
parent 76aec10b8a b273774ea7
commit c554aceba6
60 changed files with 423 additions and 74 deletions
--- a/pmd-scala-modules/pmd-scala-common/pom.xml
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -28,6 +28,10 @@
            <testResource>
                <directory>../pmd-scala-common/src/test/resources</directory>
            </testResource>
+            <!-- Adding kotlin files to test resources, so that checkstyle verifies the license header -->
+            <testResource>
+                <directory>../pmd-scala-common/src/test/kotlin</directory>
+            </testResource>
        </testResources>

        <pluginManagement>