diff --git a/package.json b/package.json index 707dbc8cf..d6ed9833f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/sfdx-scanner", "description": "Static code scanner that applies quality and security rules to Apex code, and provides feedback.", - "version": "4.9.0", + "version": "4.10.0", "author": "Salesforce Code Analyzer Team", "bugs": "https://github.com/forcedotcom/sfdx-scanner/issues", "dependencies": { diff --git a/pmd7/build.gradle.kts b/pmd7/build.gradle.kts index cefbe2754..8790f32f2 100644 --- a/pmd7/build.gradle.kts +++ b/pmd7/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } // Keep this in sync with src/Constants.ts > PMD7_VERSION -var pmd7Version = "7.9.0" +var pmd7Version = "7.10.0" val pmdDist7Dir = "$buildDir/../../dist/pmd7" @@ -26,18 +26,6 @@ dependencies { implementation("net.sourceforge.pmd:pmd-xml:$pmd7Version") } -// TEMPORARY - FOR SOME REASON WHEN UPGRADING TO PMD 7.9.0, THE TRANSITIVE DEPENDENCY: -// io.github.apex-dev-tools:apex-parser -// IS GETTING PULLED IN AS 4.3.1 INSTEAD OF THE LISTED 4.3.0 AND IT SEEMS TO HAVE A BUG: A MISSING DEPENDENCY LISTED. -// SO WE SHOULD FORCE 4.3.0 TO GET PULLED IN INSTEAD UNTIL THIS IS FIXED. -// See https://github.com/pmd/pmd/issues/5456 -// TODO: As soon as the pmd folks fix this ^... we should remove this workaround: -configurations.all { - resolutionStrategy { - force("io.github.apex-dev-tools:apex-parser:4.3.0") - } -} - tasks.register("copyDependencies") { from(configurations.runtimeClasspath) into("$pmdDist7Dir/lib") diff --git a/src/Constants.ts b/src/Constants.ts index f99511813..5c79ee33b 100644 --- a/src/Constants.ts +++ b/src/Constants.ts @@ -2,7 +2,7 @@ import os = require('os'); import path = require('path'); // Keep this in sync with /pmd7/build.gradle.kts > pmd7Version -export const PMD7_VERSION = '7.9.0'; +export const PMD7_VERSION = '7.10.0'; export const PMD_APPEXCHANGE_RULES_VERSION = '0.16';