Skip to content

Commit 0969c9c

Browse files
committed
Fix merge Conflict
Signed-off-by: ziadhany <[email protected]>
1 parent a9a6ea2 commit 0969c9c

File tree

5 files changed

+2502
-1246
lines changed

5 files changed

+2502
-1246
lines changed

vulnerabilities/tests/test_data/apache_tomcat/parse-apache_tomcat-selected-advisories-expected.json

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"severities": []
4949
}
5050
],
51-
"date_published": null
51+
"date_published": null,
52+
"weaknesses": []
5253
},
5354
{
5455
"aliases": [
@@ -99,7 +100,8 @@
99100
"severities": []
100101
}
101102
],
102-
"date_published": null
103+
"date_published": null,
104+
"weaknesses": []
103105
},
104106
{
105107
"aliases": [
@@ -150,7 +152,8 @@
150152
"severities": []
151153
}
152154
],
153-
"date_published": null
155+
"date_published": null,
156+
"weaknesses": []
154157
},
155158
{
156159
"aliases": [
@@ -201,7 +204,8 @@
201204
"severities": []
202205
}
203206
],
204-
"date_published": null
207+
"date_published": null,
208+
"weaknesses": []
205209
},
206210
{
207211
"aliases": [
@@ -252,7 +256,8 @@
252256
"severities": []
253257
}
254258
],
255-
"date_published": null
259+
"date_published": null,
260+
"weaknesses": []
256261
},
257262
{
258263
"aliases": [
@@ -308,7 +313,8 @@
308313
"severities": []
309314
}
310315
],
311-
"date_published": null
316+
"date_published": null,
317+
"weaknesses": []
312318
},
313319
{
314320
"aliases": [
@@ -364,7 +370,8 @@
364370
"severities": []
365371
}
366372
],
367-
"date_published": null
373+
"date_published": null,
374+
"weaknesses": []
368375
},
369376
{
370377
"aliases": [
@@ -415,7 +422,8 @@
415422
"severities": []
416423
}
417424
],
418-
"date_published": null
425+
"date_published": null,
426+
"weaknesses": []
419427
},
420428
{
421429
"aliases": [
@@ -466,7 +474,8 @@
466474
"severities": []
467475
}
468476
],
469-
"date_published": null
477+
"date_published": null,
478+
"weaknesses": []
470479
},
471480
{
472481
"aliases": [
@@ -517,7 +526,8 @@
517526
"severities": []
518527
}
519528
],
520-
"date_published": null
529+
"date_published": null,
530+
"weaknesses": []
521531
},
522532
{
523533
"aliases": [
@@ -573,7 +583,8 @@
573583
"severities": []
574584
}
575585
],
576-
"date_published": null
586+
"date_published": null,
587+
"weaknesses": []
577588
},
578589
{
579590
"aliases": [
@@ -619,7 +630,8 @@
619630
]
620631
}
621632
],
622-
"date_published": null
633+
"date_published": null,
634+
"weaknesses": []
623635
},
624636
{
625637
"aliases": [
@@ -665,7 +677,8 @@
665677
]
666678
}
667679
],
668-
"date_published": null
680+
"date_published": null,
681+
"weaknesses": []
669682
},
670683
{
671684
"aliases": [
@@ -711,7 +724,8 @@
711724
]
712725
}
713726
],
714-
"date_published": null
727+
"date_published": null,
728+
"weaknesses": []
715729
},
716730
{
717731
"aliases": [
@@ -757,7 +771,8 @@
757771
]
758772
}
759773
],
760-
"date_published": null
774+
"date_published": null,
775+
"weaknesses": []
761776
},
762777
{
763778
"aliases": [
@@ -803,7 +818,8 @@
803818
]
804819
}
805820
],
806-
"date_published": null
821+
"date_published": null,
822+
"weaknesses": []
807823
},
808824
{
809825
"aliases": [
@@ -849,6 +865,7 @@
849865
]
850866
}
851867
],
852-
"date_published": null
868+
"date_published": null,
869+
"weaknesses": []
853870
}
854871
]

vulnerabilities/tests/test_data/elixir_security/elixir-expected.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"severities": []
2626
}
2727
],
28-
"date_published": null
28+
"date_published": null,
29+
"weaknesses": []
2930
}
3031
]

0 commit comments

Comments
 (0)