Skip to content

Commit 03ebe7f

Browse files
authored
Merge branch 'main' into mbaluda/sanitize-content
2 parents 863ea7b + 918f8a6 commit 03ebe7f

File tree

13 files changed

+153
-152
lines changed

13 files changed

+153
-152
lines changed

extractors/javascript/tools/pre-finalize.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@ if [ -z "${CODEQL_EXTRACTOR_CDS_SKIP_EXTRACTION:-}" ]; then
2020
echo "Finished running database index-files for CDS (.cds) files."
2121
fi
2222

23-
echo "Running database index-files for UI5 (.view.xml) files ..."
23+
echo "Running database index-files for UI5 (.view.xml and .fragment.xml) files ..."
2424

25-
# Index UI5 *.view.xml files.
25+
# Index UI5 *.view.xml and *.fragment.xml files.
2626
"${CODEQL_DIST}/codeql" database index-files \
2727
--include-extension=".view.xml" \
28+
--include-extension=".fragment.xml" \
2829
--language="xml" \
2930
--prune="**/node_modules/**/*" \
3031
--prune="**/.eslint/**/*" \
3132
--total-size-limit="10m" \
3233
-- \
3334
"$CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE"
3435

35-
echo "Finished running database index-files for UI5 (.view.xml) files."
36+
echo "Finished running database index-files for UI5 (.view.xml and .fragment.xml) files."
3637

3738
# UI5 also requires *.view.json files and *.view.html files be indexed, but these are indexed by
3839
# default by CodeQL.

javascript/frameworks/cap/lib/codeql-pack.lock.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.9
5+
version: 0.0.12
66
codeql/controlflow:
7-
version: 2.0.19
7+
version: 2.0.22
88
codeql/dataflow:
9-
version: 2.0.19
9+
version: 2.0.22
1010
codeql/javascript-all:
11-
version: 2.6.15
11+
version: 2.6.18
1212
codeql/mad:
13-
version: 1.0.35
13+
version: 1.0.38
1414
codeql/regex:
15-
version: 1.0.35
15+
version: 1.0.38
1616
codeql/ssa:
17-
version: 2.0.11
17+
version: 2.0.14
1818
codeql/threat-models:
19-
version: 1.0.35
19+
version: 1.0.38
2020
codeql/tutorial:
21-
version: 1.0.35
21+
version: 1.0.38
2222
codeql/typetracking:
23-
version: 2.0.19
24-
codeql/util:
2523
version: 2.0.22
24+
codeql/util:
25+
version: 2.0.25
2626
codeql/xml:
27-
version: 1.0.35
27+
version: 1.0.38
2828
codeql/yaml:
29-
version: 1.0.35
29+
version: 1.0.38
3030
compiled: false

javascript/frameworks/cap/src/codeql-pack.lock.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.9
5+
version: 0.0.12
66
codeql/controlflow:
7-
version: 2.0.19
7+
version: 2.0.22
88
codeql/dataflow:
9-
version: 2.0.19
9+
version: 2.0.22
1010
codeql/javascript-all:
11-
version: 2.6.15
11+
version: 2.6.18
1212
codeql/mad:
13-
version: 1.0.35
13+
version: 1.0.38
1414
codeql/regex:
15-
version: 1.0.35
15+
version: 1.0.38
1616
codeql/ssa:
17-
version: 2.0.11
17+
version: 2.0.14
1818
codeql/threat-models:
19-
version: 1.0.35
19+
version: 1.0.38
2020
codeql/tutorial:
21-
version: 1.0.35
21+
version: 1.0.38
2222
codeql/typetracking:
23-
version: 2.0.19
24-
codeql/util:
2523
version: 2.0.22
24+
codeql/util:
25+
version: 2.0.25
2626
codeql/xml:
27-
version: 1.0.35
27+
version: 1.0.38
2828
codeql/yaml:
29-
version: 1.0.35
29+
version: 1.0.38
3030
compiled: false

javascript/frameworks/cap/test/codeql-pack.lock.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.9
5+
version: 0.0.12
66
codeql/controlflow:
7-
version: 2.0.19
7+
version: 2.0.22
88
codeql/dataflow:
9-
version: 2.0.19
9+
version: 2.0.22
1010
codeql/javascript-all:
11-
version: 2.6.15
11+
version: 2.6.18
1212
codeql/mad:
13-
version: 1.0.35
13+
version: 1.0.38
1414
codeql/regex:
15-
version: 1.0.35
15+
version: 1.0.38
1616
codeql/ssa:
17-
version: 2.0.11
17+
version: 2.0.14
1818
codeql/threat-models:
19-
version: 1.0.35
19+
version: 1.0.38
2020
codeql/tutorial:
21-
version: 1.0.35
21+
version: 1.0.38
2222
codeql/typetracking:
23-
version: 2.0.19
24-
codeql/util:
2523
version: 2.0.22
24+
codeql/util:
25+
version: 2.0.25
2626
codeql/xml:
27-
version: 1.0.35
27+
version: 1.0.38
2828
codeql/yaml:
29-
version: 1.0.35
29+
version: 1.0.38
3030
compiled: false

javascript/frameworks/ui5-webcomponents/test/codeql-pack.lock.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.7
5+
version: 0.0.12
66
codeql/controlflow:
7-
version: 2.0.17
7+
version: 2.0.22
88
codeql/dataflow:
9-
version: 2.0.17
9+
version: 2.0.22
1010
codeql/javascript-all:
11-
version: 2.6.13
11+
version: 2.6.18
1212
codeql/mad:
13-
version: 1.0.33
13+
version: 1.0.38
1414
codeql/regex:
15-
version: 1.0.33
15+
version: 1.0.38
1616
codeql/ssa:
17-
version: 2.0.9
17+
version: 2.0.14
1818
codeql/threat-models:
19-
version: 1.0.33
19+
version: 1.0.38
2020
codeql/tutorial:
21-
version: 1.0.33
21+
version: 1.0.38
2222
codeql/typetracking:
23-
version: 2.0.17
23+
version: 2.0.22
2424
codeql/util:
25-
version: 2.0.20
25+
version: 2.0.25
2626
codeql/xml:
27-
version: 1.0.33
27+
version: 1.0.38
2828
codeql/yaml:
29-
version: 1.0.33
29+
version: 1.0.38
3030
compiled: false

javascript/frameworks/ui5/lib/codeql-pack.lock.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.9
5+
version: 0.0.12
66
codeql/controlflow:
7-
version: 2.0.19
7+
version: 2.0.22
88
codeql/dataflow:
9-
version: 2.0.19
9+
version: 2.0.22
1010
codeql/javascript-all:
11-
version: 2.6.15
11+
version: 2.6.18
1212
codeql/mad:
13-
version: 1.0.35
13+
version: 1.0.38
1414
codeql/regex:
15-
version: 1.0.35
15+
version: 1.0.38
1616
codeql/ssa:
17-
version: 2.0.11
17+
version: 2.0.14
1818
codeql/threat-models:
19-
version: 1.0.35
19+
version: 1.0.38
2020
codeql/tutorial:
21-
version: 1.0.35
21+
version: 1.0.38
2222
codeql/typetracking:
23-
version: 2.0.19
24-
codeql/util:
2523
version: 2.0.22
24+
codeql/util:
25+
version: 2.0.25
2626
codeql/xml:
27-
version: 1.0.35
27+
version: 1.0.38
2828
codeql/yaml:
29-
version: 1.0.35
29+
version: 1.0.38
3030
compiled: false

javascript/frameworks/ui5/src/codeql-pack.lock.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.9
5+
version: 0.0.12
66
codeql/controlflow:
7-
version: 2.0.19
7+
version: 2.0.22
88
codeql/dataflow:
9-
version: 2.0.19
9+
version: 2.0.22
1010
codeql/javascript-all:
11-
version: 2.6.15
11+
version: 2.6.18
1212
codeql/mad:
13-
version: 1.0.35
13+
version: 1.0.38
1414
codeql/regex:
15-
version: 1.0.35
15+
version: 1.0.38
1616
codeql/ssa:
17-
version: 2.0.11
17+
version: 2.0.14
1818
codeql/threat-models:
19-
version: 1.0.35
19+
version: 1.0.38
2020
codeql/tutorial:
21-
version: 1.0.35
21+
version: 1.0.38
2222
codeql/typetracking:
23-
version: 2.0.19
24-
codeql/util:
2523
version: 2.0.22
24+
codeql/util:
25+
version: 2.0.25
2626
codeql/xml:
27-
version: 1.0.35
27+
version: 1.0.38
2828
codeql/yaml:
29-
version: 1.0.35
29+
version: 1.0.38
3030
compiled: false

javascript/frameworks/ui5/test/codeql-pack.lock.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.9
5+
version: 0.0.12
66
codeql/controlflow:
7-
version: 2.0.19
7+
version: 2.0.22
88
codeql/dataflow:
9-
version: 2.0.19
9+
version: 2.0.22
1010
codeql/javascript-all:
11-
version: 2.6.15
11+
version: 2.6.18
1212
codeql/javascript-queries:
13-
version: 2.2.0
13+
version: 2.2.3
1414
codeql/mad:
15-
version: 1.0.35
15+
version: 1.0.38
1616
codeql/regex:
17-
version: 1.0.35
17+
version: 1.0.38
1818
codeql/ssa:
19-
version: 2.0.11
19+
version: 2.0.14
2020
codeql/suite-helpers:
21-
version: 1.0.35
21+
version: 1.0.38
2222
codeql/threat-models:
23-
version: 1.0.35
23+
version: 1.0.38
2424
codeql/tutorial:
25-
version: 1.0.35
25+
version: 1.0.38
2626
codeql/typetracking:
27-
version: 2.0.19
27+
version: 2.0.22
2828
codeql/typos:
29-
version: 1.0.35
29+
version: 1.0.38
3030
codeql/util:
31-
version: 2.0.22
31+
version: 2.0.25
3232
codeql/xml:
33-
version: 1.0.35
33+
version: 1.0.38
3434
codeql/yaml:
35-
version: 1.0.35
35+
version: 1.0.38
3636
compiled: false

javascript/frameworks/xsjs/lib/codeql-pack.lock.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/concepts:
5-
version: 0.0.9
5+
version: 0.0.12
66
codeql/controlflow:
7-
version: 2.0.19
7+
version: 2.0.22
88
codeql/dataflow:
9-
version: 2.0.19
9+
version: 2.0.22
1010
codeql/javascript-all:
11-
version: 2.6.15
11+
version: 2.6.18
1212
codeql/mad:
13-
version: 1.0.35
13+
version: 1.0.38
1414
codeql/regex:
15-
version: 1.0.35
15+
version: 1.0.38
1616
codeql/ssa:
17-
version: 2.0.11
17+
version: 2.0.14
1818
codeql/threat-models:
19-
version: 1.0.35
19+
version: 1.0.38
2020
codeql/tutorial:
21-
version: 1.0.35
21+
version: 1.0.38
2222
codeql/typetracking:
23-
version: 2.0.19
24-
codeql/util:
2523
version: 2.0.22
24+
codeql/util:
25+
version: 2.0.25
2626
codeql/xml:
27-
version: 1.0.35
27+
version: 1.0.38
2828
codeql/yaml:
29-
version: 1.0.35
29+
version: 1.0.38
3030
compiled: false

0 commit comments

Comments
 (0)