Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jsoup upgrade to address security vulnerabilities #1625

Merged
merged 7 commits into from
Sep 2, 2021
Merged

jsoup upgrade to address security vulnerabilities #1625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3d59739
jsoup upgrade to address security vulnerabilities
lintool Aug 27, 2021
d62d6ad
cw12 updated figureS
lintool Aug 27, 2021
95a76c5
Updated md
lintool Aug 27, 2021
a5bd83f
Merge branch 'master' of github.com:castorini/anserini into jsoup-upg…
lintool Aug 27, 2021
993b432
Merge branch 'master' into jsoup-upgrade
lintool Aug 28, 2021
af35bcf
Update README.md
lintool Aug 28, 2021
6491f25
Update README.md
lintool Aug 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ For the most part, these runs are based on [_default_ parameter settings](https:
+ Regressions for [Tweets2011 (MB11 & MB12)](docs/regressions-mb11.md), [Tweets2013 (MB13 & MB14)](docs/regressions-mb13.md)
+ Regressions for Complex Answer Retrieval (CAR17): [[v1.5](docs/regressions-car17v1.5.md)] [[v2.0](docs/regressions-car17v2.0.md)] [[v2.0 with doc2query](docs/regressions-car17v2.0-doc2query.md)]
+ Regressions for MS MARCO Passage Ranking: [[base](docs/regressions-msmarco-passage.md)] [[doc2query](docs/regressions-msmarco-passage-doc2query.md)] [[docTTTTTquery](docs/regressions-msmarco-passage-docTTTTTquery.md)]
+ Regressions for MS MARCO Document Ranking - Per Doc: [[base](docs/regressions-msmarco-doc.md)] [[docTTTTTquery](docs/regressions-msmarco-doc-docTTTTTquery-per-doc.md)]
+ Regressions for MS MARCO Document Ranking - Per Passage: [[base](docs/regressions-msmarco-doc-per-passage.md)] [[docTTTTTquery](docs/regressions-msmarco-doc-docTTTTTquery-per-passage.md)]
+ Regressions for the TREC 2019 Deep Learning Track (Passage Ranking): [[base](docs/regressions-dl19-passage.md)] [[docTTTTTquery](docs/regressions-dl19-passage-docTTTTTquery.md)]
+ Regressions for the TREC 2019 Deep Learning Track (Document Ranking) - Per Doc: [[base](docs/regressions-dl19-doc.md)] [[docTTTTTquery](docs/regressions-dl19-doc-docTTTTTquery-per-doc.md)]
+ Regressions for the TREC 2019 Deep Learning Track (Document Ranking) - Per Passage: [[base](docs/regressions-dl19-doc-per-passage.md)] [[docTTTTTquery](docs/regressions-dl19-doc-docTTTTTquery-per-passage.md)]
+ Regressions for the TREC 2020 Deep Learning Track (Passage Ranking): [[base](docs/regressions-dl20-passage.md)] [[docTTTTTquery](docs/regressions-dl20-passage-docTTTTTquery.md)]
+ Regressions for the TREC 2020 Deep Learning Track (Document Ranking) - Per Doc: [[base](docs/regressions-dl20-doc.md)] [[docTTTTTquery](docs/regressions-dl20-doc-docTTTTTquery-per-doc.md)]
+ Regressions for the TREC 2020 Deep Learning Track (Document Ranking) - Per Passage: [[base](docs/regressions-dl20-doc-per-passage.md)] [[docTTTTTquery](docs/regressions-dl20-doc-docTTTTTquery-per-passage.md)]
+ Regressions for MS MARCO Document Ranking, Per Doc: [[base](docs/regressions-msmarco-doc.md)] [[docTTTTTquery](docs/regressions-msmarco-doc-docTTTTTquery-per-doc.md)]
+ Regressions for MS MARCO Document Ranking, Per Passage: [[base](docs/regressions-msmarco-doc-per-passage.md)] [[docTTTTTquery](docs/regressions-msmarco-doc-docTTTTTquery-per-passage.md)]
+ Regressions for the TREC 2019 Deep Learning Track (Passage): [[base](docs/regressions-dl19-passage.md)] [[docTTTTTquery](docs/regressions-dl19-passage-docTTTTTquery.md)]
+ Regressions for the TREC 2019 Deep Learning Track (Document), Per Doc: [[base](docs/regressions-dl19-doc.md)] [[docTTTTTquery](docs/regressions-dl19-doc-docTTTTTquery-per-doc.md)]
+ Regressions for the TREC 2019 Deep Learning Track (Document), Per Passage: [[base](docs/regressions-dl19-doc-per-passage.md)] [[docTTTTTquery](docs/regressions-dl19-doc-docTTTTTquery-per-passage.md)]
+ Regressions for the TREC 2020 Deep Learning Track (Passage): [[base](docs/regressions-dl20-passage.md)] [[docTTTTTquery](docs/regressions-dl20-passage-docTTTTTquery.md)]
+ Regressions for the TREC 2020 Deep Learning Track (Document), Per Doc: [[base](docs/regressions-dl20-doc.md)] [[docTTTTTquery](docs/regressions-dl20-doc-docTTTTTquery-per-doc.md)]
+ Regressions for the TREC 2020 Deep Learning Track (Document), Per Passage: [[base](docs/regressions-dl20-doc-per-passage.md)] [[docTTTTTquery](docs/regressions-dl20-doc-docTTTTTquery-per-passage.md)]
+ Regressions for the TREC News Track (Background Linking Task): [[2018](docs/regressions-backgroundlinking18.md)] [[2019](docs/regressions-backgroundlinking19.md)] [[2020](docs/regressions-backgroundlinking20.md)]
+ Regressions for [FEVER Fact Verification](docs/regressions-fever.md)
+ Regressions for [NTCIR-8 ACLIA (IR4QA subtask, Monolingual Chinese)](docs/regressions-ntcir8-zh.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/regressions-backgroundlinking19.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ NCDG@5 | BM25 | +RM3 | +RM3+DF |

AP | BM25 | +RM3 | +RM3+DF |
:---------------------------------------|-----------|-----------|-----------|
[TREC 2019 Topics](../src/main/resources/topics-and-qrels/topics.backgroundlinking19.txt)| 0.3027 | 0.3790 | 0.3158 |
[TREC 2019 Topics](../src/main/resources/topics-and-qrels/topics.backgroundlinking19.txt)| 0.3029 | 0.3786 | 0.3154 |

4 changes: 2 additions & 2 deletions docs/regressions-backgroundlinking20.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ With the above commands, you should be able to reproduce the following results:

NCDG@5 | BM25 | +RM3 | +RM3+DF |
:---------------------------------------|-----------|-----------|-----------|
[TREC 2020 Topics](../src/main/resources/topics-and-qrels/topics.backgroundlinking20.txt)| 0.5231 | 0.5673 | 0.5279 |
[TREC 2020 Topics](../src/main/resources/topics-and-qrels/topics.backgroundlinking20.txt)| 0.5231 | 0.5673 | 0.5316 |


AP | BM25 | +RM3 | +RM3+DF |
:---------------------------------------|-----------|-----------|-----------|
[TREC 2020 Topics](../src/main/resources/topics-and-qrels/topics.backgroundlinking20.txt)| 0.3286 | 0.4504 | 0.3421 |
[TREC 2020 Topics](../src/main/resources/topics-and-qrels/topics.backgroundlinking20.txt)| 0.3286 | 0.4519 | 0.3438 |

4 changes: 2 additions & 2 deletions docs/regressions-core18.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ With the above commands, you should be able to reproduce the following results:

MAP | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2018 Common Core Track Topics](../src/main/resources/topics-and-qrels/topics.core18.txt)| 0.2495 | 0.3135 | 0.2841 | 0.2526 | 0.3073 | 0.2919 |
[TREC 2018 Common Core Track Topics](../src/main/resources/topics-and-qrels/topics.core18.txt)| 0.2496 | 0.3139 | 0.2840 | 0.2527 | 0.3074 | 0.2920 |


P30 | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2018 Common Core Track Topics](../src/main/resources/topics-and-qrels/topics.core18.txt)| 0.3567 | 0.4200 | 0.3947 | 0.3653 | 0.4000 | 0.4020 |
[TREC 2018 Common Core Track Topics](../src/main/resources/topics-and-qrels/topics.core18.txt)| 0.3573 | 0.4200 | 0.3947 | 0.3653 | 0.3993 | 0.4013 |

## Reproduction Log[*](reproducibility.md)

Expand Down
24 changes: 12 additions & 12 deletions docs/regressions-cw09b.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,27 +168,27 @@ With the above commands, you should be able to reproduce the following results:

MAP | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2010 Web Track (Topics 51-100)](../src/main/resources/topics-and-qrels/topics.web.51-100.txt)| 0.1126 | 0.0933 | 0.0929 | 0.1060 | 0.1019 | 0.1086 |
[TREC 2011 Web Track (Topics 101-150)](../src/main/resources/topics-and-qrels/topics.web.101-150.txt)| 0.1094 | 0.1085 | 0.0975 | 0.0958 | 0.0839 | 0.0879 |
[TREC 2012 Web Track (Topics 151-200)](../src/main/resources/topics-and-qrels/topics.web.151-200.txt)| 0.1105 | 0.1107 | 0.1315 | 0.1069 | 0.1058 | 0.1212 |
[TREC 2010 Web Track (Topics 51-100)](../src/main/resources/topics-and-qrels/topics.web.51-100.txt)| 0.1126 | 0.0931 | 0.0961 | 0.1060 | 0.1019 | 0.1088 |
[TREC 2011 Web Track (Topics 101-150)](../src/main/resources/topics-and-qrels/topics.web.101-150.txt)| 0.1094 | 0.1085 | 0.0986 | 0.0959 | 0.0839 | 0.0860 |
[TREC 2012 Web Track (Topics 151-200)](../src/main/resources/topics-and-qrels/topics.web.151-200.txt)| 0.1106 | 0.1108 | 0.1356 | 0.1070 | 0.1058 | 0.1224 |


P30 | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2010 Web Track (Topics 51-100)](../src/main/resources/topics-and-qrels/topics.web.51-100.txt)| 0.2694 | 0.2389 | 0.2354 | 0.2431 | 0.2312 | 0.2618 |
[TREC 2011 Web Track (Topics 101-150)](../src/main/resources/topics-and-qrels/topics.web.101-150.txt)| 0.2513 | 0.2480 | 0.2387 | 0.2147 | 0.2047 | 0.2173 |
[TREC 2012 Web Track (Topics 151-200)](../src/main/resources/topics-and-qrels/topics.web.151-200.txt)| 0.2167 | 0.1920 | 0.2553 | 0.2080 | 0.1980 | 0.2147 |
[TREC 2010 Web Track (Topics 51-100)](../src/main/resources/topics-and-qrels/topics.web.51-100.txt)| 0.2681 | 0.2382 | 0.2535 | 0.2438 | 0.2312 | 0.2625 |
[TREC 2011 Web Track (Topics 101-150)](../src/main/resources/topics-and-qrels/topics.web.101-150.txt)| 0.2513 | 0.2487 | 0.2367 | 0.2147 | 0.2053 | 0.2120 |
[TREC 2012 Web Track (Topics 151-200)](../src/main/resources/topics-and-qrels/topics.web.151-200.txt)| 0.2167 | 0.1927 | 0.2547 | 0.2080 | 0.1980 | 0.2220 |


NDCG20 | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2010 Web Track (Topics 51-100)](../src/main/resources/topics-and-qrels/topics.web.51-100.txt)| 0.1354 | 0.1369 | 0.1632 | 0.1143 | 0.1182 | 0.1454 |
[TREC 2011 Web Track (Topics 101-150)](../src/main/resources/topics-and-qrels/topics.web.101-150.txt)| 0.1890 | 0.1916 | 0.1835 | 0.1619 | 0.1449 | 0.1517 |
[TREC 2012 Web Track (Topics 151-200)](../src/main/resources/topics-and-qrels/topics.web.151-200.txt)| 0.1014 | 0.0918 | 0.1441 | 0.0868 | 0.0896 | 0.1037 |
[TREC 2010 Web Track (Topics 51-100)](../src/main/resources/topics-and-qrels/topics.web.51-100.txt)| 0.1351 | 0.1368 | 0.1767 | 0.1143 | 0.1182 | 0.1495 |
[TREC 2011 Web Track (Topics 101-150)](../src/main/resources/topics-and-qrels/topics.web.101-150.txt)| 0.1894 | 0.1915 | 0.1854 | 0.1631 | 0.1449 | 0.1537 |
[TREC 2012 Web Track (Topics 151-200)](../src/main/resources/topics-and-qrels/topics.web.151-200.txt)| 0.1015 | 0.0918 | 0.1388 | 0.0875 | 0.0896 | 0.1091 |


ERR20 | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2010 Web Track (Topics 51-100)](../src/main/resources/topics-and-qrels/topics.web.51-100.txt)| 0.0733 | 0.0747 | 0.0977 | 0.0599 | 0.0592 | 0.0742 |
[TREC 2011 Web Track (Topics 101-150)](../src/main/resources/topics-and-qrels/topics.web.101-150.txt)| 0.0959 | 0.0960 | 0.1091 | 0.0849 | 0.0787 | 0.0821 |
[TREC 2012 Web Track (Topics 151-200)](../src/main/resources/topics-and-qrels/topics.web.151-200.txt)| 0.1303 | 0.1494 | 0.2355 | 0.1305 | 0.1334 | 0.1558 |
[TREC 2010 Web Track (Topics 51-100)](../src/main/resources/topics-and-qrels/topics.web.51-100.txt)| 0.0733 | 0.0747 | 0.1019 | 0.0599 | 0.0592 | 0.0751 |
[TREC 2011 Web Track (Topics 101-150)](../src/main/resources/topics-and-qrels/topics.web.101-150.txt)| 0.0959 | 0.0959 | 0.0950 | 0.0850 | 0.0787 | 0.0861 |
[TREC 2012 Web Track (Topics 151-200)](../src/main/resources/topics-and-qrels/topics.web.151-200.txt)| 0.1304 | 0.1494 | 0.2399 | 0.1306 | 0.1333 | 0.1564 |
16 changes: 8 additions & 8 deletions docs/regressions-cw12.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,23 @@ With the above commands, you should be able to reproduce the following results:

MAP | BM25 | +RM3 | QL | +RM3 |
:---------------------------------------|-----------|-----------|-----------|-----------|
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.1694 | 0.1464 | 0.1494 | 0.1290 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.2469 | 0.2324 | 0.2466 | 0.2177 |
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.1695 | 0.1465 | 0.1493 | 0.1290 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.2470 | 0.2330 | 0.2467 | 0.2178 |


P30 | BM25 | +RM3 | QL | +RM3 |
:---------------------------------------|-----------|-----------|-----------|-----------|
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.2773 | 0.2393 | 0.2607 | 0.2347 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.4547 | 0.4080 | 0.4380 | 0.3800 |
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.2767 | 0.2393 | 0.2607 | 0.2347 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.4547 | 0.4080 | 0.4380 | 0.3813 |


NDCG20 | BM25 | +RM3 | QL | +RM3 |
:---------------------------------------|-----------|-----------|-----------|-----------|
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.2088 | 0.2033 | 0.1993 | 0.1725 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.2572 | 0.2530 | 0.2218 | 0.2083 |
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.2085 | 0.2033 | 0.1993 | 0.1725 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.2572 | 0.2516 | 0.2220 | 0.2093 |


ERR20 | BM25 | +RM3 | QL | +RM3 |
:---------------------------------------|-----------|-----------|-----------|-----------|
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.1284 | 0.1264 | 0.1233 | 0.1008 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.1616 | 0.1655 | 0.1322 | 0.1245 |
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.1283 | 0.1265 | 0.1233 | 0.1007 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.1616 | 0.1652 | 0.1323 | 0.1249 |
14 changes: 7 additions & 7 deletions docs/regressions-cw12b13.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,26 +128,26 @@ With the above commands, you should be able to reproduce the following results:

MAP | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.0468 | 0.0408 | 0.0435 | 0.0397 | 0.0322 | 0.0358 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.0224 | 0.0210 | 0.0180 | 0.0235 | 0.0203 | 0.0183 |
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.0468 | 0.0408 | 0.0432 | 0.0397 | 0.0322 | 0.0356 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.0224 | 0.0210 | 0.0181 | 0.0235 | 0.0203 | 0.0179 |


P30 | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.2113 | 0.1673 | 0.1833 | 0.1780 | 0.1513 | 0.1507 |
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.2107 | 0.1673 | 0.1780 | 0.1773 | 0.1513 | 0.1567 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.1273 | 0.1207 | 0.1107 | 0.1373 | 0.1173 | 0.1147 |


NDCG20 | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.1286 | 0.1119 | 0.1287 | 0.1106 | 0.0920 | 0.1141 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.1183 | 0.1081 | 0.0963 | 0.1177 | 0.1004 | 0.0989 |
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.1289 | 0.1114 | 0.1311 | 0.1104 | 0.0921 | 0.1113 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.1183 | 0.1075 | 0.0974 | 0.1176 | 0.1004 | 0.0984 |


ERR20 | BM25 | +RM3 | +Ax | QL | +RM3 | +Ax |
:---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.0838 | 0.0753 | 0.0941 | 0.0768 | 0.0553 | 0.0780 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.1201 | 0.1066 | 0.0928 | 0.1092 | 0.0928 | 0.0900 |
[TREC 2013 Web Track (Topics 201-250)](../src/main/resources/topics-and-qrels/topics.web.201-250.txt)| 0.0838 | 0.0752 | 0.0949 | 0.0767 | 0.0552 | 0.0720 |
[TREC 2014 Web Track (Topics 251-300)](../src/main/resources/topics-and-qrels/topics.web.251-300.txt)| 0.1198 | 0.1055 | 0.0925 | 0.1091 | 0.0928 | 0.0879 |

## Reproduction Log[*](reproducibility.md)

Expand Down
Loading