Merge branch 'master' into 7.0.x

This commit is contained in:
Clément Fournier
2020-01-24 20:11:43 +01:00
2 changed files with 2 additions and 4 deletions

View File

@ -65,9 +65,7 @@ public class BinaryDistributionIT extends AbstractBinaryDistributionTest {
ExecutionResult result;
result = PMDExecutor.runPMD(tempDir, "-h");
// note: the language "text" is provided by pmd-designer
result.assertExecutionResult(0, "apex, ecmascript, java, jsp, modelica, plsql, pom, scala, swift, text, vf, vm, wsdl, xml, xsl");
result.assertExecutionResult(0, "apex, ecmascript, java, jsp, modelica, plsql, pom, scala, swift, vf, vm, wsdl, xml, xsl");
result = PMDExecutor.runPMDRules(tempDir, srcDir, "src/test/resources/rulesets/sample-ruleset.xml");
result.assertExecutionResult(4, "", "JumbledIncrementer.java:8:");

View File

@ -106,7 +106,7 @@ Objective-C, Perl, PHP, PLSQL, Python, Ruby, Salesforce.com Apex, Scala, Swift a
<pmd.build-tools.version>5</pmd.build-tools.version>
<pmd-designer.version>6.19.0</pmd-designer.version>
<pmd-designer.version>6.21.0</pmd-designer.version>
<javacc.jar>${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar</javacc.jar>
</properties>