From 43dd6567e2c14006570e90f0e8544818740c2926 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 2 Jul 2020 10:13:08 +0200 Subject: [PATCH 01/11] [java] Update test dependency log4j This fixes https://github.com/advisories/GHSA-vwqq-5vrc-xw9h --- pmd-java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index 5ff10aa5fd..fe443b6268 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -158,13 +158,13 @@ org.apache.logging.log4j log4j-api - 2.12.1 + 2.13.3 test org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.3 test From c7ccb8a087309cac5fa4ba7d60ef26fa3b1554d3 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 2 Jul 2020 10:27:26 +0200 Subject: [PATCH 02/11] javacc is only needed during parser generation --- pmd-core/pom.xml | 11 +++++++---- pmd-java/pom.xml | 2 ++ pmd-jsp/pom.xml | 2 ++ pmd-plsql/pom.xml | 2 ++ pmd-visualforce/pom.xml | 2 ++ pmd-vm/pom.xml | 2 ++ pom.xml | 1 + 7 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml index 0089efa13a..9590252ed0 100644 --- a/pmd-core/pom.xml +++ b/pmd-core/pom.xml @@ -97,6 +97,12 @@ ant provided + + net.java.dev.javacc + javacc + provided + + org.antlr antlr4-runtime @@ -122,10 +128,7 @@ --> true - - net.java.dev.javacc - javacc - + net.sourceforge.saxon saxon diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index fe443b6268..7c96252e5b 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -110,7 +110,9 @@ net.java.dev.javacc javacc + provided + net.sourceforge.pmd pmd-core diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml index a01fdccf22..72fd206133 100644 --- a/pmd-jsp/pom.xml +++ b/pmd-jsp/pom.xml @@ -75,7 +75,9 @@ net.java.dev.javacc javacc + provided + net.sourceforge.pmd pmd-core diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml index 3f44ed5a1d..4c1883ce71 100644 --- a/pmd-plsql/pom.xml +++ b/pmd-plsql/pom.xml @@ -83,7 +83,9 @@ net.java.dev.javacc javacc + provided + net.sourceforge.pmd pmd-core diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml index 7c3b8b7d23..7888583f33 100644 --- a/pmd-visualforce/pom.xml +++ b/pmd-visualforce/pom.xml @@ -75,7 +75,9 @@ net.java.dev.javacc javacc + provided + net.sourceforge.pmd pmd-core diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml index 0e92c868d2..ed046aaf92 100644 --- a/pmd-vm/pom.xml +++ b/pmd-vm/pom.xml @@ -83,7 +83,9 @@ net.java.dev.javacc javacc + provided + net.sourceforge.pmd pmd-core diff --git a/pom.xml b/pom.xml index 277c3f1a07..794df57bdc 100644 --- a/pom.xml +++ b/pom.xml @@ -658,6 +658,7 @@ net.java.dev.javacc javacc ${javacc.version} + provided commons-io From 80d9e1801155ac7ca1c35431c5283acb6b9f96b1 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 2 Jul 2020 14:16:39 +0200 Subject: [PATCH 03/11] pmd-lang-test: clarify dependencies --- pmd-lang-test/pom.xml | 36 +++++++++++++++++++++++++++++++++++- pom.xml | 13 +++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml index 26669a0869..ffc92adffc 100644 --- a/pmd-lang-test/pom.xml +++ b/pmd-lang-test/pom.xml @@ -89,11 +89,39 @@ pmd-core + + org.apache.commons + commons-lang3 + + + commons-io + commons-io + + + + io.kotlintest + kotlintest-assertions + compile + + + org.jetbrains.kotlin + kotlin-test + compile + + + + org.jetbrains + annotations + 13.0 + compile + + org.hamcrest hamcrest @@ -141,12 +169,18 @@ 2.1.0 compile + + com.github.oowekyala.treeutils + tree-printers + 2.1.0 + compile + net.sourceforge.pmd pmd-java - 6.12.0 + 6.25.0 test diff --git a/pom.xml b/pom.xml index 794df57bdc..a9c6d1a661 100644 --- a/pom.xml +++ b/pom.xml @@ -812,12 +812,25 @@ test + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + + io.kotlintest kotlintest-runner-junit5 3.1.8 test + + io.kotlintest + kotlintest-assertions + 3.1.8 + test + From 370c0b0b6d30adea1d0d49e156f0828f640cee2c Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 2 Jul 2020 15:12:31 +0200 Subject: [PATCH 04/11] Remove unused dependency, explicitly declare used dependencies --- pmd-apex-jorje/pom.xml | 1 - pmd-apex/pom.xml | 240 +++++++++--------- .../pmd/lang/apex/metrics/ApexMetrics.java | 3 - pmd-cpp/pom.xml | 4 - pmd-cs/pom.xml | 4 +- pmd-dart/pom.xml | 8 +- pmd-dist/pom.xml | 5 - pmd-doc/pom.xml | 5 - pmd-fortran/pom.xml | 4 - pmd-go/pom.xml | 8 +- pmd-groovy/pom.xml | 13 +- pmd-java/pom.xml | 95 ++++--- pmd-java8/pom.xml | 5 - pmd-javascript/pom.xml | 4 - pmd-jsp/pom.xml | 14 - pmd-kotlin/pom.xml | 8 +- pmd-lang-test/pom.xml | 11 - pmd-lua/pom.xml | 8 +- pmd-matlab/pom.xml | 4 - pmd-modelica/pom.xml | 47 ++++ pmd-objectivec/pom.xml | 4 - pmd-perl/pom.xml | 15 ++ pmd-php/pom.xml | 10 + pmd-plsql/pom.xml | 10 - pmd-python/pom.xml | 4 - pmd-ruby/pom.xml | 4 - pmd-scala-modules/pmd-scala-common/pom.xml | 49 ++++ pmd-scala-modules/pmd-scala_2.12/pom.xml | 12 +- pmd-scala-modules/pmd-scala_2.13/pom.xml | 12 +- pmd-swift/pom.xml | 8 +- pmd-visualforce/pom.xml | 14 - pmd-vm/pom.xml | 10 - pmd-xml/pom.xml | 15 +- pom.xml | 45 +++- 34 files changed, 390 insertions(+), 313 deletions(-) diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml index de533a5c87..f5b32e0bf3 100644 --- a/pmd-apex-jorje/pom.xml +++ b/pmd-apex-jorje/pom.xml @@ -89,7 +89,6 @@ org.antlr antlr-runtime - 3.5.2 org.antlr diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml index 08b66db721..67ac49220f 100644 --- a/pmd-apex/pom.xml +++ b/pmd-apex/pom.xml @@ -1,125 +1,129 @@ - - 4.0.0 - pmd-apex - PMD Apex + + 4.0.0 + pmd-apex + PMD Apex - - net.sourceforge.pmd - pmd - 6.26.0-SNAPSHOT - ../ - + + net.sourceforge.pmd + pmd + 6.26.0-SNAPSHOT + ../ + - - 8 - + + 8 + - - - - ${basedir}/src/main/resources - true - - - - - maven-resources-plugin - - false - - ${*} - - - - - - - - net.sourceforge.pmd - pmd-core - - - - ${project.groupId} - pmd-apex-jorje - ${project.version} - lib - - - - ${project.groupId} - pmd-apex-jorje - ${project.version} - pom - - - - commons-io - commons-io - - - - - net.sourceforge.saxon - saxon - - - - org.hamcrest - hamcrest - test - - - junit - junit - test - - - com.github.stefanbirkner - system-rules - test - - - org.junit.vintage - junit-vintage-engine - test - - - net.sourceforge.pmd - pmd-test - test - - - net.sourceforge.pmd - pmd-lang-test - test - - - - - - designer - + + + + ${basedir}/src/main/resources + true + + - - org.codehaus.mojo - exec-maven-plugin - 1.4.0 - - net.sourceforge.pmd.util.designer.Designer - true - - - - net.sourceforge.pmd - pmd-java - ${project.version} - - - + + maven-resources-plugin + + false + + ${*} + + + - - - + + + + net.sourceforge.pmd + pmd-core + + + org.antlr + antlr-runtime + + + + ${project.groupId} + pmd-apex-jorje + ${project.version} + lib + + + + ${project.groupId} + pmd-apex-jorje + ${project.version} + pom + + + + commons-io + commons-io + + + org.apache.commons + commons-lang3 + + + + + org.hamcrest + hamcrest + test + + + junit + junit + test + + + com.github.stefanbirkner + system-rules + test + + + org.junit.vintage + junit-vintage-engine + test + + + net.sourceforge.pmd + pmd-test + test + + + net.sourceforge.pmd + pmd-lang-test + test + + + + + + designer + + + + org.codehaus.mojo + exec-maven-plugin + 1.4.0 + + net.sourceforge.pmd.util.designer.Designer + true + + + + net.sourceforge.pmd + pmd-java + ${project.version} + + + + + + + diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/metrics/ApexMetrics.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/metrics/ApexMetrics.java index d8dd2ec984..9c22ae27e5 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/metrics/ApexMetrics.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/metrics/ApexMetrics.java @@ -7,8 +7,6 @@ package net.sourceforge.pmd.lang.apex.metrics; import java.util.ArrayList; import java.util.List; -import org.checkerframework.checker.nullness.qual.NonNull; - import net.sourceforge.pmd.lang.apex.ast.ASTMethod; import net.sourceforge.pmd.lang.apex.ast.ASTUserClass; import net.sourceforge.pmd.lang.apex.ast.ASTUserClassOrInterface; @@ -136,7 +134,6 @@ public final class ApexMetrics { } - @NonNull public static List findOps(ASTUserClassOrInterface node) { List candidates = node.findChildrenOfType(ASTMethod.class); List result = new ArrayList<>(candidates); diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml index 51d5111c0b..b2dd19ece7 100644 --- a/pmd-cpp/pom.xml +++ b/pmd-cpp/pom.xml @@ -70,10 +70,6 @@ net.sourceforge.pmd pmd-core - - commons-io - commons-io - junit diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml index 7d6939ed6e..38a5a822be 100644 --- a/pmd-cs/pom.xml +++ b/pmd-cs/pom.xml @@ -36,8 +36,8 @@ pmd-core - commons-io - commons-io + org.antlr + antlr4-runtime diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml index e2fbafc4b8..f489c42d7c 100644 --- a/pmd-dart/pom.xml +++ b/pmd-dart/pom.xml @@ -31,17 +31,13 @@ - - org.antlr - antlr4-runtime - net.sourceforge.pmd pmd-core - commons-io - commons-io + org.antlr + antlr4-runtime diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml index 96fca07038..59c3076e03 100644 --- a/pmd-dist/pom.xml +++ b/pmd-dist/pom.xml @@ -229,11 +229,6 @@ commons-lang3 - - org.hamcrest - hamcrest - test - junit junit diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml index 22f43c9c0b..a2811d07ce 100644 --- a/pmd-doc/pom.xml +++ b/pmd-doc/pom.xml @@ -103,11 +103,6 @@ 1.19 - - org.hamcrest - hamcrest - test - junit junit diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml index 9e451b1c53..f5926fc80b 100644 --- a/pmd-fortran/pom.xml +++ b/pmd-fortran/pom.xml @@ -29,10 +29,6 @@ net.sourceforge.pmd pmd-core - - commons-io - commons-io - junit diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml index 773a98e3b3..2c65c6a915 100644 --- a/pmd-go/pom.xml +++ b/pmd-go/pom.xml @@ -29,14 +29,14 @@ - - org.antlr - antlr4-runtime - net.sourceforge.pmd pmd-core + + org.antlr + antlr4-runtime + junit diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml index 655f884a74..e3afe3ef74 100644 --- a/pmd-groovy/pom.xml +++ b/pmd-groovy/pom.xml @@ -26,19 +26,14 @@ - - org.codehaus.groovy - groovy - - - commons-io - commons-io - - net.sourceforge.pmd pmd-core + + org.codehaus.groovy + groovy + junit diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index 7c96252e5b..41a7476b9a 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -107,12 +107,6 @@ - - net.java.dev.javacc - javacc - provided - - net.sourceforge.pmd pmd-core @@ -134,13 +128,6 @@ commons-lang3 - - net.sourceforge.saxon - saxon - dom - runtime - - net.sourceforge.pmd @@ -152,23 +139,6 @@ pmd-test test - - org.slf4j - slf4j-api - test - - - org.apache.logging.log4j - log4j-api - 2.13.3 - test - - - org.apache.logging.log4j - log4j-core - 2.13.3 - test - org.hamcrest hamcrest @@ -195,6 +165,71 @@ ant-testutil test + + + com.github.oowekyala.treeutils + tree-matchers + test + + + com.github.oowekyala.treeutils + tree-printers + test + + + io.kotlintest + kotlintest-runner-junit5 + test + + + io.kotlintest + kotlintest-assertions + test + + + io.kotlintest + kotlintest-core + test + + + com.google.guava + guava + test + + + org.jetbrains.kotlin + kotlin-stdlib + test + + + org.jetbrains.kotlin + kotlin-test + test + + + org.jetbrains + annotations + test + + + + + org.slf4j + slf4j-api + test + + + org.apache.logging.log4j + log4j-api + 2.13.3 + test + + + org.apache.logging.log4j + log4j-core + 2.13.3 + test + org.assertj assertj-core diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml index 6507278282..9e4bb0cf44 100644 --- a/pmd-java8/pom.xml +++ b/pmd-java8/pom.xml @@ -56,11 +56,6 @@ pmd-core - - org.hamcrest - hamcrest - test - junit junit diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml index a97cff755b..706f3d09cc 100644 --- a/pmd-javascript/pom.xml +++ b/pmd-javascript/pom.xml @@ -83,10 +83,6 @@ commons-io commons-io - - net.sourceforge.saxon - saxon - junit diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml index 72fd206133..554324da5d 100644 --- a/pmd-jsp/pom.xml +++ b/pmd-jsp/pom.xml @@ -72,24 +72,10 @@ - - net.java.dev.javacc - javacc - provided - - net.sourceforge.pmd pmd-core - - commons-io - commons-io - - - net.sourceforge.saxon - saxon - junit diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml index bce62d34f6..09c881677c 100644 --- a/pmd-kotlin/pom.xml +++ b/pmd-kotlin/pom.xml @@ -31,17 +31,13 @@ - - org.antlr - antlr4-runtime - net.sourceforge.pmd pmd-core - commons-io - commons-io + org.antlr + antlr4-runtime diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml index ffc92adffc..077910a59e 100644 --- a/pmd-lang-test/pom.xml +++ b/pmd-lang-test/pom.xml @@ -118,7 +118,6 @@ org.jetbrains annotations - 13.0 compile @@ -166,22 +165,12 @@ com.github.oowekyala.treeutils tree-matchers - 2.1.0 compile com.github.oowekyala.treeutils tree-printers - 2.1.0 compile - - - - net.sourceforge.pmd - pmd-java - 6.25.0 - test - diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml index a519014e08..2bc6f0754f 100644 --- a/pmd-lua/pom.xml +++ b/pmd-lua/pom.xml @@ -31,17 +31,13 @@ - - org.antlr - antlr4-runtime - net.sourceforge.pmd pmd-core - commons-io - commons-io + org.antlr + antlr4-runtime diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml index cd3585c4bb..0b71aad03e 100644 --- a/pmd-matlab/pom.xml +++ b/pmd-matlab/pom.xml @@ -70,10 +70,6 @@ net.sourceforge.pmd pmd-core - - commons-io - commons-io - junit diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml index ddb1f877e6..9b02d62b80 100644 --- a/pmd-modelica/pom.xml +++ b/pmd-modelica/pom.xml @@ -78,6 +78,53 @@ pmd-core + + com.github.oowekyala.treeutils + tree-matchers + test + + + com.github.oowekyala.treeutils + tree-printers + test + + + org.jetbrains.kotlin + kotlin-stdlib + test + + + org.jetbrains.kotlin + kotlin-test + test + + + org.jetbrains + annotations + test + + + io.kotlintest + kotlintest-runner-junit5 + test + + + io.kotlintest + kotlintest-assertions + test + + + io.kotlintest + kotlintest-core + test + + + + + junit + junit + test + org.junit.vintage junit-vintage-engine diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml index 2bbbb7cbf5..dafc12b184 100644 --- a/pmd-objectivec/pom.xml +++ b/pmd-objectivec/pom.xml @@ -70,10 +70,6 @@ net.sourceforge.pmd pmd-core - - commons-io - commons-io - junit diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml index 2eb7fd9c34..55fb10ac2b 100644 --- a/pmd-perl/pom.xml +++ b/pmd-perl/pom.xml @@ -30,10 +30,25 @@ pmd-core + + junit + junit + test + + + org.junit.vintage + junit-vintage-engine + test + net.sourceforge.pmd pmd-test test + + net.sourceforge.pmd + pmd-lang-test + test + diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml index a985180d05..3cf2f6bce6 100644 --- a/pmd-php/pom.xml +++ b/pmd-php/pom.xml @@ -35,10 +35,20 @@ junit test + + org.junit.vintage + junit-vintage-engine + test + net.sourceforge.pmd pmd-test test + + net.sourceforge.pmd + pmd-lang-test + test + diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml index 4c1883ce71..74f54637bb 100644 --- a/pmd-plsql/pom.xml +++ b/pmd-plsql/pom.xml @@ -80,12 +80,6 @@ - - net.java.dev.javacc - javacc - provided - - net.sourceforge.pmd pmd-core @@ -94,10 +88,6 @@ commons-io commons-io - - net.sourceforge.saxon - saxon - junit diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml index 1340131928..42e44fa67e 100644 --- a/pmd-python/pom.xml +++ b/pmd-python/pom.xml @@ -70,10 +70,6 @@ net.sourceforge.pmd pmd-core - - commons-io - commons-io - junit diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml index fc6778050e..7c70becc38 100644 --- a/pmd-ruby/pom.xml +++ b/pmd-ruby/pom.xml @@ -16,10 +16,6 @@ net.sourceforge.pmd pmd-core - - commons-io - commons-io - junit diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml index de9580fe17..1bfca64ac2 100644 --- a/pmd-scala-modules/pmd-scala-common/pom.xml +++ b/pmd-scala-modules/pmd-scala-common/pom.xml @@ -103,6 +103,55 @@ net.sourceforge.pmd pmd-core + + commons-io + commons-io + + + org.apache.commons + commons-lang3 + + + + com.github.oowekyala.treeutils + tree-matchers + test + + + com.github.oowekyala.treeutils + tree-printers + test + + + io.kotlintest + kotlintest-runner-junit5 + test + + + io.kotlintest + kotlintest-assertions + test + + + io.kotlintest + kotlintest-core + test + + + org.jetbrains.kotlin + kotlin-stdlib + test + + + org.jetbrains.kotlin + kotlin-test + test + + + org.jetbrains + annotations + test + junit diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml index 1a912de417..ad244664fa 100644 --- a/pmd-scala-modules/pmd-scala_2.12/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml @@ -25,9 +25,19 @@ + + org.scala-lang + scala-library + ${scalaVersion} + org.scalameta - scalameta_${scalaVersion} + parsers_${scalaVersion} + ${scalameta.version} + + + org.scalameta + trees_${scalaVersion} ${scalameta.version} diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml index 7a72d501e5..eea8d7fad3 100644 --- a/pmd-scala-modules/pmd-scala_2.13/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml @@ -25,9 +25,19 @@ + + org.scala-lang + scala-library + ${scalaVersion} + org.scalameta - scalameta_${scalaVersion} + parsers_${scalaVersion} + ${scalameta.version} + + + org.scalameta + trees_${scalaVersion} ${scalameta.version} diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml index 7744be7696..20c1afe4b7 100644 --- a/pmd-swift/pom.xml +++ b/pmd-swift/pom.xml @@ -31,17 +31,13 @@ - - org.antlr - antlr4-runtime - net.sourceforge.pmd pmd-core - commons-io - commons-io + org.antlr + antlr4-runtime diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml index 7888583f33..b9687e9df8 100644 --- a/pmd-visualforce/pom.xml +++ b/pmd-visualforce/pom.xml @@ -72,24 +72,10 @@ - - net.java.dev.javacc - javacc - provided - - net.sourceforge.pmd pmd-core - - commons-io - commons-io - - - net.sourceforge.saxon - saxon - junit diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml index ed046aaf92..ded0e269b3 100644 --- a/pmd-vm/pom.xml +++ b/pmd-vm/pom.xml @@ -80,12 +80,6 @@ - - net.java.dev.javacc - javacc - provided - - net.sourceforge.pmd pmd-core @@ -94,10 +88,6 @@ org.apache.commons commons-lang3 - - net.sourceforge.saxon - saxon - junit diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml index 4876d5561b..bbdf4568fc 100644 --- a/pmd-xml/pom.xml +++ b/pmd-xml/pom.xml @@ -35,30 +35,19 @@ - - org.antlr - antlr4-runtime - net.sourceforge.pmd pmd-core - net.sourceforge.saxon - saxon + org.antlr + antlr4-runtime commons-io commons-io - - net.sourceforge.saxon - saxon - dom - runtime - - junit junit diff --git a/pom.xml b/pom.xml index a9c6d1a661..d96b6fab6b 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.1.3-SNAPSHOT org.apache.maven.plugins @@ -594,6 +594,12 @@ antlr4-runtime ${antlr.version} + + + org.antlr + antlr-runtime + 3.5.2 + org.apache.ant ant @@ -696,6 +702,26 @@ test + + com.github.oowekyala.treeutils + tree-matchers + 2.1.0 + test + + + com.github.oowekyala.treeutils + tree-printers + 2.1.0 + test + + + + com.google.guava + guava + 18.0 + test + + org.hamcrest hamcrest @@ -790,28 +816,24 @@ ${kotlin.version} test - org.jetbrains.kotlin kotlin-stdlib-jdk8 ${kotlin.version} test - org.jetbrains.kotlin kotlin-reflect ${kotlin.version} test - org.jetbrains.kotlin kotlin-test-junit ${kotlin.version} test - org.jetbrains.kotlin kotlin-test @@ -831,6 +853,19 @@ 3.1.8 test + + io.kotlintest + kotlintest-core + 3.1.8 + test + + + + org.jetbrains + annotations + 13.0 + test + From 373c9b09449a023e76b4e7640f7228b4c99942e2 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 2 Jul 2020 20:30:54 +0200 Subject: [PATCH 05/11] Fix scala library versions --- pmd-scala-modules/pmd-scala_2.12/pom.xml | 2 +- pmd-scala-modules/pmd-scala_2.13/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml index ad244664fa..80aabc12b3 100644 --- a/pmd-scala-modules/pmd-scala_2.12/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml @@ -28,7 +28,7 @@ org.scala-lang scala-library - ${scalaVersion} + ${scalaVersion}.10 org.scalameta diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml index eea8d7fad3..ffbd77819a 100644 --- a/pmd-scala-modules/pmd-scala_2.13/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml @@ -28,7 +28,7 @@ org.scala-lang scala-library - ${scalaVersion} + ${scalaVersion}.3 org.scalameta From 67f33e3427b61e94e07b4571b3652a6a41c30dad Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 2 Jul 2020 20:33:32 +0200 Subject: [PATCH 06/11] Add back hamcrest (it's actually test-runtime) --- pmd-dist/pom.xml | 5 +++++ pmd-doc/pom.xml | 5 +++++ pmd-java8/pom.xml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml index 59c3076e03..ea56d1ccb6 100644 --- a/pmd-dist/pom.xml +++ b/pmd-dist/pom.xml @@ -234,6 +234,11 @@ junit test + + org.hamcrest + hamcrest + test + org.apache.commons commons-compress diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml index a2811d07ce..52ad783139 100644 --- a/pmd-doc/pom.xml +++ b/pmd-doc/pom.xml @@ -108,5 +108,10 @@ junit test + + org.hamcrest + hamcrest + test + diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml index 9e4bb0cf44..53aea03a99 100644 --- a/pmd-java8/pom.xml +++ b/pmd-java8/pom.xml @@ -61,5 +61,10 @@ junit test + + org.hamcrest + hamcrest + test + From c24efea939c202ca7b0acea8809edbaa40f0a9a6 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 2 Jul 2020 21:41:19 +0200 Subject: [PATCH 07/11] Revert to use stable maven-dependency-plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d96b6fab6b..bc26acb457 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.3-SNAPSHOT + 3.1.2 org.apache.maven.plugins From 03d03440b41d47b4e69ebdef3b1964dde1c8a5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Mon, 6 Jul 2020 13:25:54 +0200 Subject: [PATCH 08/11] Declare junit dependencies before kotlintest ones This is for the scala modules. Apparently in the other order, only kotlin tests are run. --- pmd-scala-modules/pmd-scala-common/pom.xml | 43 +++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml index 1bfca64ac2..751918cc7f 100644 --- a/pmd-scala-modules/pmd-scala-common/pom.xml +++ b/pmd-scala-modules/pmd-scala-common/pom.xml @@ -112,6 +112,28 @@ commons-lang3 + + junit + junit + test + + + org.junit.vintage + junit-vintage-engine + test + + + net.sourceforge.pmd + pmd-test + test + + + net.sourceforge.pmd + pmd-lang-test + test + + + com.github.oowekyala.treeutils tree-matchers @@ -152,26 +174,5 @@ annotations test - - - junit - junit - test - - - org.junit.vintage - junit-vintage-engine - test - - - net.sourceforge.pmd - pmd-test - test - - - net.sourceforge.pmd - pmd-lang-test - test - From 96998fffc2e21c41e0fd45bb2e8f2dcc1bd2094b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Mon, 6 Jul 2020 13:35:06 +0200 Subject: [PATCH 09/11] Same for modelica --- pmd-modelica/pom.xml | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml index 9b02d62b80..02fb539322 100644 --- a/pmd-modelica/pom.xml +++ b/pmd-modelica/pom.xml @@ -78,6 +78,27 @@ pmd-core + + junit + junit + test + + + org.junit.vintage + junit-vintage-engine + test + + + net.sourceforge.pmd + pmd-lang-test + test + + + net.sourceforge.pmd + pmd-test + test + + com.github.oowekyala.treeutils tree-matchers @@ -120,25 +141,5 @@ - - junit - junit - test - - - org.junit.vintage - junit-vintage-engine - test - - - net.sourceforge.pmd - pmd-lang-test - test - - - net.sourceforge.pmd - pmd-test - test - From 94afdb117d44d365e87006f43d51bc26962113e2 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 17 Jul 2020 12:03:45 +0200 Subject: [PATCH 10/11] 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 @@ system-rules test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - com.github.stefanbirkner @@ -176,11 +171,6 @@ tree-printers test - - io.kotlintest - kotlintest-runner-junit5 - test - io.kotlintest kotlintest-assertions 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 @@ pmd-test test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-lang-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ compile - - io.kotlintest - kotlintest-runner-junit5 - compile - - com.github.oowekyala.treeutils tree-matchers 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-lang-test @@ -124,11 +119,6 @@ annotations test - - io.kotlintest - kotlintest-runner-junit5 - test - io.kotlintest kotlintest-assertions @@ -139,7 +129,5 @@ kotlintest-core test - - 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test @@ -144,11 +139,6 @@ tree-printers test - - io.kotlintest - kotlintest-runner-junit5 - test - io.kotlintest kotlintest-assertions 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test 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 @@ junit test - - org.junit.vintage - junit-vintage-engine - test - net.sourceforge.pmd pmd-test diff --git a/pom.xml b/pom.xml index bc26acb457..aa7034af50 100644 --- a/pom.xml +++ b/pom.xml @@ -86,11 +86,12 @@ ${maven.compiler.test.target} 1.3.0 + 3.1.8 0.10.1 5.0 - 2.22.1 + 3.0.0-M5 8.30 3.1.1 3.13.0 @@ -259,6 +260,20 @@ ${project.build.testResources[0].directory} + + + + org.junit.vintage + junit-vintage-engine + 5.6.2 + + + + io.kotlintest + kotlintest-runner-junit5 + ${kotlintest.version} + + org.codehaus.mojo @@ -775,40 +790,6 @@ test - - - org.junit.jupiter - junit-jupiter-api - 5.5.0 - test - - - org.junit.jupiter - junit-jupiter-engine - 5.5.0 - test - - - - org.junit.platform - junit-platform-commons - 1.5.0 - - - org.junit.platform - junit-platform-launcher - 1.5.0 - test - - - - - org.junit.vintage - junit-vintage-engine - 5.5.0 - test - - org.jetbrains.kotlin @@ -841,22 +822,16 @@ test - - io.kotlintest - kotlintest-runner-junit5 - 3.1.8 - test - io.kotlintest kotlintest-assertions - 3.1.8 + ${kotlintest.version} test io.kotlintest kotlintest-core - 3.1.8 + ${kotlintest.version} test From fc3ee5375bff103b71297f4903c365e0b0bc6949 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 17 Jul 2020 12:05:06 +0200 Subject: [PATCH 11/11] [doc] Update release notes, fixes #710 --- docs/pages/release_notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index b8f8783555..6f50ac3043 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -15,6 +15,8 @@ This is a {{ site.pmd.release_type }} release. ### New and noteworthy ### Fixed Issues +* core + * [#710](https://github.com/pmd/pmd/issues/710): \[core] Review used dependencies ### API Changes