Skip to content

Commit 6f126b6

Browse files
mpkorstanjempkorstanje
committed
[Core] Upgrade vis-timeline to v7.4.8
Fixes: #2289
1 parent c274fdd commit 6f126b6

File tree

9 files changed

+47
-57
lines changed

9 files changed

+47
-57
lines changed

Diff for: ‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1616
### Removed
1717

1818
### Fixed
19+
* [Core] Upgraded `vis-timeline` to v7.4.8
20+
- Fixes CVE-2020-28487
1921

2022
## [6.10.3] (2021-04-14)
2123

Diff for: ‎core/src/main/java/io/cucumber/core/plugin/TimelineFormatter.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public final class TimelineFormatter implements ConcurrentEventListener {
3939
"/io/cucumber/core/plugin/timeline/formatter.js",
4040
"/io/cucumber/core/plugin/timeline/report.css",
4141
"/io/cucumber/core/plugin/timeline/jquery-3.5.1.min.js",
42-
"/io/cucumber/core/plugin/timeline/vis.min.css",
43-
"/io/cucumber/core/plugin/timeline/vis.min.js",
44-
"/io/cucumber/core/plugin/timeline/vis.override.css",
42+
"/io/cucumber/core/plugin/timeline/vis-timeline-graph2d.min.css",
43+
"/io/cucumber/core/plugin/timeline/vis-timeline-graph2d.min.js",
44+
"/io/cucumber/core/plugin/timeline/vis-timeline-graph2d.override.css",
4545
"/io/cucumber/core/plugin/timeline/chosen.jquery.min.js",
4646
"/io/cucumber/core/plugin/timeline/chosen.min.css",
4747
"/io/cucumber/core/plugin/timeline/chosen.override.css",
@@ -212,7 +212,6 @@ class TestData {
212212
TestData(final TestCaseStarted started, final Long threadId) {
213213
this.id = getId(started);
214214
final TestCase testCase = started.getTestCase();
215-
final URI uri = testCase.getUri();
216215
this.feature = findRootNodeName(testCase);
217216
this.scenario = testCase.getName();
218217
this.startTime = started.getInstant().toEpochMilli();

Diff for: ‎core/src/main/resources/io/cucumber/core/plugin/timeline/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<head>
44
<meta charset="utf-8">
55
<title>Cucumber Timeline</title>
6-
<link href="vis.min.css" rel="stylesheet" type="text/css"/>
7-
<link href="vis.override.css" rel="stylesheet" type="text/css"/>
6+
<link href="vis-timeline-graph2d.min.css" rel="stylesheet" type="text/css"/>
7+
<link href="vis-timeline-graph2d.override.css" rel="stylesheet" type="text/css"/>
88
<link href="chosen.min.css" rel="stylesheet" type="text/css"/>
99
<link href="chosen.override.css" rel="stylesheet" type="text/css"/>
1010
<link href="report.css" rel="stylesheet" type="text/css"/>
1111
<script src="jquery-3.5.1.min.js"></script>
1212
<script src="chosen.jquery.min.js"></script>
13-
<script src="vis.min.js"></script>
13+
<script src="vis-timeline-graph2d.min.js"></script>
1414
<script src="formatter.js"></script>
1515
<script src="report.js"></script>
1616
</head>

Diff for: ‎core/src/main/resources/io/cucumber/core/plugin/timeline/vis-timeline-graph2d.min.css

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎core/src/main/resources/io/cucumber/core/plugin/timeline/vis-timeline-graph2d.min.js

+35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎core/src/main/resources/io/cucumber/core/plugin/timeline/vis.override.css renamed to ‎core/src/main/resources/io/cucumber/core/plugin/timeline/vis-timeline-graph2d.override.css

File renamed without changes.

Diff for: ‎core/src/main/resources/io/cucumber/core/plugin/timeline/vis.min.css

-1
This file was deleted.

Diff for: ‎core/src/main/resources/io/cucumber/core/plugin/timeline/vis.min.js

-47
This file was deleted.

Diff for: ‎core/src/test/java/io/cucumber/core/plugin/TimelineFormatterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ void shouldWriteAllRequiredFilesToOutputDirectory() throws IOException {
106106

107107
assertThat(reportJsFile.exists(), is(equalTo(true)));
108108

109-
final List<String> files = Arrays.asList("index.html", "formatter.js", "jquery-3.5.1.min.js", "vis.min.css",
110-
"vis.min.js", "vis.override.css");
109+
final List<String> files = Arrays.asList("index.html", "formatter.js", "jquery-3.5.1.min.js", "vis-timeline-graph2d.min.css",
110+
"vis-timeline-graph2d.min.js", "vis-timeline-graph2d.override.css");
111111
for (final String e : files) {
112112
final File actualFile = new File(reportDir, e);
113113
assertThat(e + ": did not exist in output dir", actualFile.exists(), is(equalTo(true)));

0 commit comments

Comments
 (0)