From 5a1f9e58ec7b23d922635680d9f7374a283b63b6 Mon Sep 17 00:00:00 2001 From: Remco Vermeulen Date: Tue, 24 Oct 2023 16:10:34 -0700 Subject: [PATCH 1/2] Upgrade CodeQL dependencies and bump pack versions --- javascript/frameworks/ui5/ext/qlpack.yml | 6 +++--- .../frameworks/ui5/lib/codeql-pack.lock.yml | 12 +++++++----- javascript/frameworks/ui5/lib/qlpack.yml | 6 +++--- .../frameworks/ui5/src/codeql-pack.lock.yml | 12 +++++++----- javascript/frameworks/ui5/src/qlpack.yml | 8 ++++---- .../frameworks/ui5/test/codeql-pack.lock.yml | 18 ++++++++++-------- javascript/frameworks/ui5/test/qlpack.yml | 12 ++++++------ scripts/codeql-pack.lock.yml | 14 +++++++------- scripts/qlpack.yml | 2 +- 9 files changed, 48 insertions(+), 42 deletions(-) diff --git a/javascript/frameworks/ui5/ext/qlpack.yml b/javascript/frameworks/ui5/ext/qlpack.yml index 23e18667..41b1e972 100644 --- a/javascript/frameworks/ui5/ext/qlpack.yml +++ b/javascript/frameworks/ui5/ext/qlpack.yml @@ -1,9 +1,9 @@ --- library: true name: advanced-security/javascript-sap-ui5-models -version: 0.3.0 +version: 0.4.0 extensionTargets: - codeql/javascript-all: "^0.6.3" - codeql/javascript-queries: "^0.6.3" + codeql/javascript-all: "^0.8.1" + codeql/javascript-queries: "^0.8.1" dataExtensions: - "*.model.yml" diff --git a/javascript/frameworks/ui5/lib/codeql-pack.lock.yml b/javascript/frameworks/ui5/lib/codeql-pack.lock.yml index f8b36209..7e43634f 100644 --- a/javascript/frameworks/ui5/lib/codeql-pack.lock.yml +++ b/javascript/frameworks/ui5/lib/codeql-pack.lock.yml @@ -2,13 +2,15 @@ lockVersion: 1.0.0 dependencies: codeql/javascript-all: - version: 0.6.4 + version: 0.8.1 + codeql/mad: + version: 0.2.1 codeql/regex: - version: 0.0.15 + version: 0.2.1 codeql/tutorial: - version: 0.0.12 + version: 0.2.1 codeql/util: - version: 0.0.12 + version: 0.2.1 codeql/yaml: - version: 0.0.4 + version: 0.2.1 compiled: false diff --git a/javascript/frameworks/ui5/lib/qlpack.yml b/javascript/frameworks/ui5/lib/qlpack.yml index 44442641..25a31aa3 100644 --- a/javascript/frameworks/ui5/lib/qlpack.yml +++ b/javascript/frameworks/ui5/lib/qlpack.yml @@ -1,9 +1,9 @@ --- library: true name: advanced-security/javascript-sap-ui5-all -version: 0.3.0 +version: 0.4.0 suites: codeql-suites extractor: javascript dependencies: - codeql/javascript-all: "^0.6.3" - advanced-security/javascript-sap-ui5-models: "^0.3.0" \ No newline at end of file + codeql/javascript-all: "^0.8.1" + advanced-security/javascript-sap-ui5-models: "^0.4.0" \ No newline at end of file diff --git a/javascript/frameworks/ui5/src/codeql-pack.lock.yml b/javascript/frameworks/ui5/src/codeql-pack.lock.yml index f8b36209..7e43634f 100644 --- a/javascript/frameworks/ui5/src/codeql-pack.lock.yml +++ b/javascript/frameworks/ui5/src/codeql-pack.lock.yml @@ -2,13 +2,15 @@ lockVersion: 1.0.0 dependencies: codeql/javascript-all: - version: 0.6.4 + version: 0.8.1 + codeql/mad: + version: 0.2.1 codeql/regex: - version: 0.0.15 + version: 0.2.1 codeql/tutorial: - version: 0.0.12 + version: 0.2.1 codeql/util: - version: 0.0.12 + version: 0.2.1 codeql/yaml: - version: 0.0.4 + version: 0.2.1 compiled: false diff --git a/javascript/frameworks/ui5/src/qlpack.yml b/javascript/frameworks/ui5/src/qlpack.yml index 028c9371..831c5c86 100644 --- a/javascript/frameworks/ui5/src/qlpack.yml +++ b/javascript/frameworks/ui5/src/qlpack.yml @@ -1,11 +1,11 @@ --- library: false name: advanced-security/javascript-sap-ui5-queries -version: 0.3.0 +version: 0.4.0 suites: codeql-suites extractor: javascript dependencies: - codeql/javascript-all: "^0.6.3" - advanced-security/javascript-sap-ui5-models: "^0.3.0" - advanced-security/javascript-sap-ui5-all: "^0.3.0" + codeql/javascript-all: "^0.8.1" + advanced-security/javascript-sap-ui5-models: "^0.4.0" + advanced-security/javascript-sap-ui5-all: "^0.4.0" default-suite-file: codeql-suites/sap-ui5-code-scanning.qls diff --git a/javascript/frameworks/ui5/test/codeql-pack.lock.yml b/javascript/frameworks/ui5/test/codeql-pack.lock.yml index 79d3aa8c..516f3e8a 100644 --- a/javascript/frameworks/ui5/test/codeql-pack.lock.yml +++ b/javascript/frameworks/ui5/test/codeql-pack.lock.yml @@ -2,19 +2,21 @@ lockVersion: 1.0.0 dependencies: codeql/javascript-all: - version: 0.6.4 + version: 0.8.1 codeql/javascript-queries: - version: 0.6.4 + version: 0.8.1 + codeql/mad: + version: 0.2.1 codeql/regex: - version: 0.0.15 + version: 0.2.1 codeql/suite-helpers: - version: 0.5.4 + version: 0.7.1 codeql/tutorial: - version: 0.0.12 + version: 0.2.1 codeql/typos: - version: 0.0.19 + version: 0.2.1 codeql/util: - version: 0.0.12 + version: 0.2.1 codeql/yaml: - version: 0.0.4 + version: 0.2.1 compiled: false diff --git a/javascript/frameworks/ui5/test/qlpack.yml b/javascript/frameworks/ui5/test/qlpack.yml index 642854b5..b96d9607 100644 --- a/javascript/frameworks/ui5/test/qlpack.yml +++ b/javascript/frameworks/ui5/test/qlpack.yml @@ -1,9 +1,9 @@ name: advanced-security/javascript-sap-ui5-queries-tests -version: 0.3.0 +version: 0.4.0 extractor: javascript dependencies: - codeql/javascript-all: "^0.6.3" - codeql/javascript-queries: "^0.6.3" - advanced-security/javascript-sap-ui5-queries: "^0.2.0" - advanced-security/javascript-sap-ui5-models: "^0.2.0" - advanced-security/javascript-sap-ui5-all: "^0.2.0" + codeql/javascript-all: "^0.8.1" + codeql/javascript-queries: "^0.8.1" + advanced-security/javascript-sap-ui5-queries: "^0.4.0" + advanced-security/javascript-sap-ui5-models: "^0.4.0" + advanced-security/javascript-sap-ui5-all: "^0.4.0" diff --git a/scripts/codeql-pack.lock.yml b/scripts/codeql-pack.lock.yml index bc9df1cc..7e43634f 100644 --- a/scripts/codeql-pack.lock.yml +++ b/scripts/codeql-pack.lock.yml @@ -2,15 +2,15 @@ lockVersion: 1.0.0 dependencies: codeql/javascript-all: - version: 0.7.0 + version: 0.8.1 codeql/mad: - version: 0.1.0 + version: 0.2.1 codeql/regex: - version: 0.1.0 + version: 0.2.1 codeql/tutorial: - version: 0.1.0 + version: 0.2.1 codeql/util: - version: 0.1.0 + version: 0.2.1 codeql/yaml: - version: 0.1.0 -compiled: false \ No newline at end of file + version: 0.2.1 +compiled: false diff --git a/scripts/qlpack.yml b/scripts/qlpack.yml index a6344877..6993811f 100644 --- a/scripts/qlpack.yml +++ b/scripts/qlpack.yml @@ -4,4 +4,4 @@ warnOnImplicitThis: false name: advanced-security/jsdoc-extraction version: 0.0.1 dependencies: - codeql/javascript-all: "*" \ No newline at end of file + codeql/javascript-all: "^0.8.1" \ No newline at end of file From 207bf3c84088f09a97a95ee101945a3161edddf8 Mon Sep 17 00:00:00 2001 From: Remco Vermeulen Date: Wed, 25 Oct 2023 11:16:45 -0700 Subject: [PATCH 2/2] Upgrade CLI to 2.15.1 --- qlt.conf.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qlt.conf.json b/qlt.conf.json index 9665476c..1db9ad4a 100644 --- a/qlt.conf.json +++ b/qlt.conf.json @@ -1,5 +1,5 @@ { - "CodeQLCLI": "2.14.1", - "CodeQLStandardLibrary": "codeql-cli/v2.14.1", - "CodeQLCLIBundle": "codeql-bundle-v2.14.1" + "CodeQLCLI": "2.15.1", + "CodeQLStandardLibrary": "codeql-cli/v2.15.1", + "CodeQLCLIBundle": "codeql-bundle-v2.15.1" } \ No newline at end of file