diff --git a/commons/pom.xml b/commons/pom.xml index f3a97e7f..9628160d 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -57,7 +57,7 @@ commons-io commons-io - 2.4 + 2.7 compile @@ -69,7 +69,7 @@ commons-collections commons-collections - 3.1 + 3.2.2 compile diff --git a/engine/pom.xml b/engine/pom.xml index 3aaacd1f..525296bc 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -30,17 +30,17 @@ org.eclipse.jetty jetty-server - 9.4.19.v20190610 + ${jetty.version} org.eclipse.jetty jetty-util - 9.4.19.v20190610 + ${jetty.version} org.eclipse.jetty jetty-servlet - 9.4.19.v20190610 + ${jetty.version} test diff --git a/engine/src/test/java/org/archive/crawler/selftest/StatisticsSelfTest.java b/engine/src/test/java/org/archive/crawler/selftest/StatisticsSelfTest.java index 005a5928..bfa73a00 100644 --- a/engine/src/test/java/org/archive/crawler/selftest/StatisticsSelfTest.java +++ b/engine/src/test/java/org/archive/crawler/selftest/StatisticsSelfTest.java @@ -48,12 +48,12 @@ public class StatisticsSelfTest extends SelfTestBase { StatisticsTracker stats = heritrix.getEngine().getJob("selftest-job").getCrawlController().getStatisticsTracker(); assertNotNull(stats); assertEquals(13, (long) stats.getCrawledBytes().get(CrawledBytesHistotable.WARC_NOVEL_URLS)); - assertEquals(7501, (long) stats.getCrawledBytes().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES) - stats.getBytesPerHost("dns:")); + assertEquals(8005, (long) stats.getCrawledBytes().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES) - stats.getBytesPerHost("dns:")); assertEquals(3, (long) stats.getServerCache().getHostFor("127.0.0.1").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_URLS)); - assertEquals(2133, (long) stats.getServerCache().getHostFor("127.0.0.1").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES)); + assertEquals(2217, (long) stats.getServerCache().getHostFor("127.0.0.1").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES)); assertEquals(10, (long) stats.getServerCache().getHostFor("localhost").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_URLS)); - assertEquals(5368, (long) stats.getServerCache().getHostFor("localhost").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES)); + assertEquals(5788, (long) stats.getServerCache().getHostFor("localhost").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_CONTENT_BYTES)); assertEquals(0, (long) stats.getServerCache().getHostFor("dns:").getSubstats().get(CrawledBytesHistotable.WARC_NOVEL_URLS)); } @@ -66,17 +66,17 @@ public class StatisticsSelfTest extends SelfTestBase { sourceStats = stats.getSourceStats("http://127.0.0.1:7777/a.html"); assertNotNull(sourceStats); assertEquals(4, sourceStats.keySet().size()); - assertEquals(2133l, (long) sourceStats.get("novel")); + assertEquals(2217l, (long) sourceStats.get("novel")); assertEquals(3l, (long) sourceStats.get("novelCount")); - assertEquals(2133l, (long) sourceStats.get("warcNovelContentBytes")); + assertEquals(2217l, (long) sourceStats.get("warcNovelContentBytes")); assertEquals(3l, (long) sourceStats.get("warcNovelUrls")); sourceStats = stats.getSourceStats("http://localhost:7777/b.html"); assertNotNull(sourceStats); assertEquals(4, sourceStats.keySet().size()); - assertEquals(5368l, (long) sourceStats.get("novel") - stats.getBytesPerHost("dns:")); + assertEquals(5788l, (long) sourceStats.get("novel") - stats.getBytesPerHost("dns:")); assertEquals(11l, (long) sourceStats.get("novelCount")); - assertEquals(5368l, (long) sourceStats.get("warcNovelContentBytes") - stats.getBytesPerHost("dns:")); + assertEquals(5788l, (long) sourceStats.get("warcNovelContentBytes") - stats.getBytesPerHost("dns:")); assertEquals(10l, (long) sourceStats.get("warcNovelUrls")); } diff --git a/modules/pom.xml b/modules/pom.xml index 3bc10a83..93bf30e1 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -37,12 +37,12 @@ org.eclipse.jetty jetty-server - 9.4.19.v20190610 + ${jetty.version} org.eclipse.jetty jetty-security - 9.4.19.v20190610 + ${jetty.version} org.littleshoot diff --git a/pom.xml b/pom.xml index 2a6b1387..a7fa4a95 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html junit junit - 4.13 + 4.13.1 @@ -411,6 +411,7 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html ${maven.build.timestamp} none -Xdoclint:none + 9.4.37.v20210219