Skip to content

Commit

Permalink
Merge pull request #389 from ukwa/update-dependencies-2021-05-26
Browse files Browse the repository at this point in the history
Update dependencies 2021 05 26
  • Loading branch information
anjackson authored May 26, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents d175040 + 669cf1e commit 3b4c442
Showing 5 changed files with 16 additions and 15 deletions.
4 changes: 2 additions & 2 deletions commons/pom.xml
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -69,7 +69,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
<version>3.2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
6 changes: 3 additions & 3 deletions engine/pom.xml
Original file line number Diff line number Diff line change
@@ -30,17 +30,17 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.4.19.v20190610</version>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>9.4.19.v20190610</version>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>9.4.19.v20190610</version>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Original file line number Diff line number Diff line change
@@ -48,12 +48,12 @@ protected void verifyWarcStats() {
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 @@ protected void verifySourceStats() throws Exception {
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"));
}

4 changes: 2 additions & 2 deletions modules/pom.xml
Original file line number Diff line number Diff line change
@@ -37,12 +37,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.4.19.v20190610</version>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>9.4.19.v20190610</version>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.littleshoot</groupId>
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -146,7 +146,7 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<version>4.13.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -411,6 +411,7 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
<build.timestamp>${maven.build.timestamp}</build.timestamp>
<doclint>none</doclint>
<additionalparam>-Xdoclint:none</additionalparam>
<jetty.version>9.4.37.v20210219</jetty.version>
</properties>
<profiles>
<profile>

0 comments on commit 3b4c442

Please sign in to comment.