Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Eclipse Update Site:
This is a minor release.

### 🚀 New and noteworthy
* Update to PMD 7.27.0

### 🐛 Fixed Issues

Expand Down
14 changes: 9 additions & 5 deletions net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,19 @@ Bundle-ClassPath: .,
target/schema/,
target/lib/ch.qos.logback.logback-classic.jar,
target/lib/ch.qos.logback.logback-core.jar,
target/lib/com.github.adangel.summit-ast.jar,
target/lib/com.github.nawforce.scala-json-rpc_2.13.jar,
target/lib/com.github.nawforce.scala-json-rpc-upickle-json-serializer_2.13.jar,
target/lib/com.github.oowekyala.ooxml.nice-xml-messages.jar,
target/lib/com.github.pathikrit.better-files_2.13.jar,
target/lib/com.google.code.findbugs.jsr305.jar,
target/lib/com.github.weisj.jsvg.jar,
target/lib/com.google.code.gson.gson.jar,
target/lib/com.google.errorprone.error_prone_annotations.jar,
target/lib/com.google.flogger.flogger-system-backend.jar,
target/lib/com.google.flogger.flogger.jar,
target/lib/com.google.guava.failureaccess.jar,
target/lib/com.google.guava.guava.jar,
target/lib/com.google.guava.listenablefuture.jar,
target/lib/com.google.j2objc.j2objc-annotations.jar,
target/lib/com.google.summit.summit-ast.jar,
target/lib/com.ibm.icu.icu4j.jar,
target/lib/com.lihaoyi.geny_2.13.jar,
target/lib/com.lihaoyi.mainargs_2.13.jar,
target/lib/com.lihaoyi.sourcecode_2.13.jar,
Expand All @@ -43,13 +42,16 @@ Bundle-ClassPath: .,
target/lib/com.lihaoyi.upickle-implicits_2.13.jar,
target/lib/com.sun.xml.bind.jaxb-core.jar,
target/lib/com.sun.xml.bind.jaxb-impl.jar,
target/lib/commons-io.commons-io.jar,
target/lib/commons-logging.commons-logging.jar,
target/lib/io.github.apex-dev-tools.apex-ls_2.13.jar,
target/lib/io.github.apex-dev-tools.apex-parser.jar,
target/lib/io.github.apex-dev-tools.apex-types_2.13.jar,
target/lib/io.github.apex-dev-tools.outline-parser_2.13.jar,
target/lib/io.github.apex-dev-tools.sobject-types.jar,
target/lib/io.github.apex-dev-tools.standard-types.jar,
target/lib/io.github.apex-dev-tools.vf-parser.jar,
target/lib/io.github.java-diff-utils.java-diff-utils.jar,
target/lib/io.methvin.directory-watcher-better-files_2.13.jar,
target/lib/io.methvin.directory-watcher.jar,
target/lib/jakarta.activation.jakarta.activation-api.jar,
Expand All @@ -58,6 +60,7 @@ Bundle-ClassPath: .,
target/lib/jakarta.xml.bind.jakarta.xml.bind-api.jar,
target/lib/javax.annotation.jsr250-api.jar,
target/lib/net.java.dev.jna.jna.jar,
target/lib/net.java.dev.jna.jna-platform.jar,
target/lib/net.sf.saxon.Saxon-HE.jar,
target/lib/net.sourceforge.pmd.pmd-apex.jar,
target/lib/net.sourceforge.pmd.pmd-coco.jar,
Expand Down Expand Up @@ -92,10 +95,11 @@ Bundle-ClassPath: .,
target/lib/net.sourceforge.pmd.pmd-velocity.jar,
target/lib/net.sourceforge.pmd.pmd-visualforce.jar,
target/lib/net.sourceforge.pmd.pmd-xml.jar,
target/lib/nl.stokpop.typemapper.kotlin-type-mapper-analyzer.jar,
target/lib/nl.stokpop.typemapper.kotlin-type-mapper-model.jar,
target/lib/org.antlr.antlr4-runtime.jar,
target/lib/org.apache.commons.commons-lang3.jar,
target/lib/org.apache.groovy.groovy.jar,
target/lib/org.checkerframework.checker-compat-qual.jar,
target/lib/org.checkerframework.checker-qual.jar,
target/lib/org.danilopianini.gson-extras.jar,
target/lib/org.jetbrains.annotations.jar,
Expand Down
14 changes: 9 additions & 5 deletions net.sourceforge.pmd.eclipse.plugin/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,19 @@ bin.includes = .,\
target/schema/,\
target/lib/ch.qos.logback.logback-classic.jar,\
target/lib/ch.qos.logback.logback-core.jar,\
target/lib/com.github.adangel.summit-ast.jar,\
target/lib/com.github.nawforce.scala-json-rpc_2.13.jar,\
target/lib/com.github.nawforce.scala-json-rpc-upickle-json-serializer_2.13.jar,\
target/lib/com.github.oowekyala.ooxml.nice-xml-messages.jar,\
target/lib/com.github.pathikrit.better-files_2.13.jar,\
target/lib/com.google.code.findbugs.jsr305.jar,\
target/lib/com.github.weisj.jsvg.jar,\
target/lib/com.google.code.gson.gson.jar,\
target/lib/com.google.errorprone.error_prone_annotations.jar,\
target/lib/com.google.flogger.flogger-system-backend.jar,\
target/lib/com.google.flogger.flogger.jar,\
target/lib/com.google.guava.failureaccess.jar,\
target/lib/com.google.guava.guava.jar,\
target/lib/com.google.guava.listenablefuture.jar,\
target/lib/com.google.j2objc.j2objc-annotations.jar,\
target/lib/com.google.summit.summit-ast.jar,\
target/lib/com.ibm.icu.icu4j.jar,\
target/lib/com.lihaoyi.geny_2.13.jar,\
target/lib/com.lihaoyi.mainargs_2.13.jar,\
target/lib/com.lihaoyi.sourcecode_2.13.jar,\
Expand All @@ -44,13 +43,16 @@ bin.includes = .,\
target/lib/com.lihaoyi.upickle-implicits_2.13.jar,\
target/lib/com.sun.xml.bind.jaxb-core.jar,\
target/lib/com.sun.xml.bind.jaxb-impl.jar,\
target/lib/commons-io.commons-io.jar,\
target/lib/commons-logging.commons-logging.jar,\
target/lib/io.github.apex-dev-tools.apex-ls_2.13.jar,\
target/lib/io.github.apex-dev-tools.apex-parser.jar,\
target/lib/io.github.apex-dev-tools.apex-types_2.13.jar,\
target/lib/io.github.apex-dev-tools.outline-parser_2.13.jar,\
target/lib/io.github.apex-dev-tools.sobject-types.jar,\
target/lib/io.github.apex-dev-tools.standard-types.jar,\
target/lib/io.github.apex-dev-tools.vf-parser.jar,\
target/lib/io.github.java-diff-utils.java-diff-utils.jar,\
target/lib/io.methvin.directory-watcher-better-files_2.13.jar,\
target/lib/io.methvin.directory-watcher.jar,\
target/lib/jakarta.activation.jakarta.activation-api.jar,\
Expand All @@ -59,6 +61,7 @@ bin.includes = .,\
target/lib/jakarta.xml.bind.jakarta.xml.bind-api.jar,\
target/lib/javax.annotation.jsr250-api.jar,\
target/lib/net.java.dev.jna.jna.jar,\
target/lib/net.java.dev.jna.jna-platform.jar,\
target/lib/net.sf.saxon.Saxon-HE.jar,\
target/lib/net.sourceforge.pmd.pmd-apex.jar,\
target/lib/net.sourceforge.pmd.pmd-coco.jar,\
Expand Down Expand Up @@ -93,10 +96,11 @@ bin.includes = .,\
target/lib/net.sourceforge.pmd.pmd-velocity.jar,\
target/lib/net.sourceforge.pmd.pmd-visualforce.jar,\
target/lib/net.sourceforge.pmd.pmd-xml.jar,\
target/lib/nl.stokpop.typemapper.kotlin-type-mapper-analyzer.jar,\
target/lib/nl.stokpop.typemapper.kotlin-type-mapper-model.jar,\
target/lib/org.antlr.antlr4-runtime.jar,\
target/lib/org.apache.commons.commons-lang3.jar,\
target/lib/org.apache.groovy.groovy.jar,\
target/lib/org.checkerframework.checker-compat-qual.jar,\
target/lib/org.checkerframework.checker-qual.jar,\
target/lib/org.danilopianini.gson-extras.jar,\
target/lib/org.jetbrains.annotations.jar,\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ protected final void reviewResource(IResource resource) {
}
LOG.debug("discovered language: {}", languageVersion);

if (PMDPlugin.getDefault().loadPreferences().isProjectBuildPathEnabled()) {
if (PMDPlugin.getDefault().loadPreferences().isProjectBuildPathEnabled()
&& configuration().getAuxClasspath() == null) {
// only set the auxclasspath once
configuration().prependAuxClasspath(projectProperties.getClasspath());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,13 @@ public IMarker[] findMarkers() {
if (element.hasMarkers()) {
// get the children markers
final IMarker[] childrenMarkers = element.findMarkers();
if (childrenMarkers != null) {
// ...and add them to the list
markerList.addAll(Arrays.asList(childrenMarkers));
}

// ...and add them to the list
markerList.addAll(Arrays.asList(childrenMarkers));
}
}

return markerList.isEmpty() ? null : markerList.toArray(new IMarker[0]);
return markerList.toArray(new IMarker[0]);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
<!-- https://github.com/eclipse/tycho/blob/master/RELEASE_NOTES.md and https://github.com/eclipse-tycho/tycho/releases -->
<tycho.version>5.0.2</tycho.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<pmd.version>7.26.0</pmd.version>
<pmd.version>7.27.0</pmd.version>
<pmd.build-tools.version>40</pmd.build-tools.version>
<checkstyle.version>14.0.0</checkstyle.version>
<checkstyle.plugin.version>3.6.0</checkstyle.plugin.version>
<pmd.plugin.version>3.28.0</pmd.plugin.version>
<pmd.check.version>7.26.0</pmd.check.version>
<pmd.check.version>7.27.0</pmd.check.version>

<keystorePath>.ci/files/pmd-eclipse-plugin.p12</keystorePath>
<keystore>${basedir}/${keystorePath}</keystore>
Expand Down