Skip to content

Commit 7fbd14f

Browse files
committed
Merge pull request #176 from adangel:update-to-pmd-7.0.0-rc2
Update to pmd 7.0.0-rc2 #176
2 parents bdfdf2c + ac93b37 commit 7fbd14f

File tree

8 files changed

+13
-133
lines changed

8 files changed

+13
-133
lines changed

ReleaseNotes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ This is a minor release.
1313

1414
### New and noteworthy
1515

16+
* Updated to PMD 7.0.0-rc2
17+
1618
### Fixed Issues
1719

20+
* [#176](https://github.com/pmd/pmd-eclipse-plugin/pull/176): Update to pmd 7.0.0-rc2
21+
1822
### API Changes
1923

2024
### External Contributions

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/BasicPMDTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private void runPmd(String javaVersion) {
7676
final String sourceCode = "public class Foo {\n public void foo() {\nreturn;\n}}";
7777

7878
try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {
79-
pmd.files().addSourceFile("Foo.java", sourceCode);
79+
pmd.files().addSourceFile(sourceCode, "Foo.java");
8080
Report result = pmd.performAnalysisAndCollectReport();
8181

8282
Assert.assertFalse("There should be at least one violation", result.getViolations().isEmpty());

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ Bundle-ClassPath: .,
5656
target/lib/pmd-java.jar,
5757
target/lib/pmd-javascript.jar,
5858
target/lib/pmd-jsp.jar,
59+
target/lib/pmd-julia.jar,
5960
target/lib/pmd-kotlin.jar,
6061
target/lib/pmd-lua.jar,
6162
target/lib/pmd-matlab.jar,

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/BaseVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ protected final void reviewResource(IResource resource) {
308308
PmdAnalysis pmdAnalysis = PmdAnalysis.create(configuration());) {
309309

310310
String sourceContents = IOUtil.toString(input);
311-
pmdAnalysis.files().addSourceFile(sourceCodeFile.getAbsolutePath(), sourceContents);
311+
pmdAnalysis.files().addSourceFile(sourceContents, sourceCodeFile.getAbsolutePath());
312312

313313
pmdAnalysis.addRuleSets(getRuleSetList());
314314

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewResourceForRuleCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void execute() {
9494
PmdAnalysis pmdAnalysis = PmdAnalysis.create(configuration)) {
9595

9696
pmdAnalysis.addRuleSet(ruleSet);
97-
pmdAnalysis.files().addSourceFile(sourceCodeFile.getAbsolutePath(), IOUtil.toString(input));
97+
pmdAnalysis.files().addSourceFile(IOUtil.toString(input), sourceCodeFile.getAbsolutePath());
9898

9999
report = pmdAnalysis.performAnalysisAndCollectReport();
100100
} catch (Exception e) {

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/views/ast/XPathEvaluator.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* @author Brian Remedios
2626
*/
2727
public final class XPathEvaluator {
28+
private static final String SNIPPET_FILENAME = "snippet.java";
2829

2930
public static final XPathEvaluator INSTANCE = new XPathEvaluator();
3031

@@ -42,15 +43,15 @@ public Node getCompilationUnit(String source) {
4243

4344
try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {
4445
pmd.addRuleSet(ruleset);
45-
pmd.files().addSourceFile("snippet.java", source);
46+
pmd.files().addSourceFile(source, SNIPPET_FILENAME);
4647
pmd.performAnalysis();
4748
}
4849

4950
return rule.getRootNode();
5051
}
5152

5253
private LanguageVersion getLanguageVersion() {
53-
return LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getDefaultVersion();
54+
return LanguageRegistry.PMD.getLanguageByFullName(JavaLanguageModule.NAME).getDefaultVersion();
5455
}
5556

5657
/**
@@ -72,7 +73,7 @@ public List<RuleViolation> evaluate(String source, String xpathQuery, String xpa
7273
configuration.setForceLanguageVersion(getLanguageVersion());
7374
try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {
7475
pmd.addRuleSet(ruleSet);
75-
pmd.files().addSourceFile("snippet.java", source);
76+
pmd.files().addSourceFile(source, SNIPPET_FILENAME);
7677
Report report = pmd.performAnalysisAndCollectReport();
7778
return report.getViolations();
7879
}

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileAnalysis.java

Lines changed: 0 additions & 126 deletions
This file was deleted.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<!-- https://github.com/eclipse/tycho/blob/master/RELEASE_NOTES.md and https://github.com/eclipse-tycho/tycho/releases -->
2222
<tycho.version>3.0.4</tycho.version>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
<pmd.version>7.0.0-rc1</pmd.version>
24+
<pmd.version>7.0.0-rc2</pmd.version>
2525
<pmd.build-tools.version>20</pmd.build-tools.version>
2626
<checkstyle.version>10.7.0</checkstyle.version>
2727
<checkstyle.plugin.version>3.2.1</checkstyle.plugin.version>

0 commit comments

Comments
 (0)