From bffcf0126f2a063cb00e42cc076c5b14d991bc6a Mon Sep 17 00:00:00 2001 From: Joshua Feingold Date: Wed, 10 Aug 2022 16:59:37 -0500 Subject: [PATCH 1/3] @W-11567651@: Updating PMD to v6.48.0. --- pmd-cataloger/build.gradle.kts | 2 +- src/Constants.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pmd-cataloger/build.gradle.kts b/pmd-cataloger/build.gradle.kts index 966b43f10..bc7f90997 100644 --- a/pmd-cataloger/build.gradle.kts +++ b/pmd-cataloger/build.gradle.kts @@ -9,7 +9,7 @@ group = "sfdx" version = "1.0" val distDir = "$buildDir/../../dist" -val pmdVersion = "6.47.0" +val pmdVersion = "6.48.0" val pmdFile = "pmd-bin-$pmdVersion.zip" val pmdUrl = "https://github.com/pmd/pmd/releases/download/pmd_releases%2F${pmdVersion}/${pmdFile}" val skippableJarRegexes = setOf("""^common_[\d\.-]*\.jar""".toRegex(), diff --git a/src/Constants.ts b/src/Constants.ts index 2481a2b4a..e4538ae52 100644 --- a/src/Constants.ts +++ b/src/Constants.ts @@ -1,7 +1,7 @@ import os = require('os'); import path = require('path'); -export const PMD_VERSION = '6.47.0'; +export const PMD_VERSION = '6.48.0'; export const SFGE_VERSION = '1.0.1-pilot'; export const CATALOG_FILE = 'Catalog.json'; export const CUSTOM_PATHS_FILE = 'CustomPaths.json'; From 005c044a266de29e7c0e4f9098a8d963ce201be3 Mon Sep 17 00:00:00 2001 From: Joshua Feingold Date: Thu, 11 Aug 2022 10:37:55 -0500 Subject: [PATCH 2/3] @W-11567651@: Fixing issue with CPD output formatting. --- src/lib/cpd/CpdEngine.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/cpd/CpdEngine.ts b/src/lib/cpd/CpdEngine.ts index ac7c11b69..0b58fd94c 100644 --- a/src/lib/cpd/CpdEngine.ts +++ b/src/lib/cpd/CpdEngine.ts @@ -190,7 +190,7 @@ export class CpdEngine extends AbstractRuleEngine { const cpdXml = stdout.slice(xmlStart, xmlEnd + cpdEnd.length); const cpdJson: Element = xml2js(cpdXml, {compact: false, ignoreDeclaration: true}) as Element; - const duplications = cpdJson.elements[0].elements; + const duplications = (cpdJson.elements[0].elements || []).filter(element => element.name === "duplication"); if (duplications) { ruleResults = this.jsonToRuleResults(duplications); } From 5d5dfea360e1cf9062f6f267edc35203a6dece76 Mon Sep 17 00:00:00 2001 From: Joshua Feingold Date: Thu, 11 Aug 2022 12:25:13 -0500 Subject: [PATCH 3/3] @W-11567651@: Added comment describing change. --- src/lib/cpd/CpdEngine.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/cpd/CpdEngine.ts b/src/lib/cpd/CpdEngine.ts index 0b58fd94c..3cecab2b2 100644 --- a/src/lib/cpd/CpdEngine.ts +++ b/src/lib/cpd/CpdEngine.ts @@ -189,7 +189,7 @@ export class CpdEngine extends AbstractRuleEngine { if (xmlStart != -1 && xmlEnd != -1) { const cpdXml = stdout.slice(xmlStart, xmlEnd + cpdEnd.length); const cpdJson: Element = xml2js(cpdXml, {compact: false, ignoreDeclaration: true}) as Element; - + // Not all of the elements in this list will be duplication tags. We only want the ones that are. const duplications = (cpdJson.elements[0].elements || []).filter(element => element.name === "duplication"); if (duplications) { ruleResults = this.jsonToRuleResults(duplications);