Merge branch 'master' into upgrade-httpclient-4-5

This commit is contained in:
Andrew Jackson
2021-06-17 21:24:34 +01:00
2 changed files with 6 additions and 12 deletions
+3 -2
View File
@@ -1,8 +1,8 @@
# Changelog
## [Unreleased](https://github.com/internetarchive/heritrix3/tree/HEAD)
## [3.4.0-20210617](https://github.com/internetarchive/heritrix3/tree/3.4.0-20210617) (2021-06-17)
[Full Changelog](https://github.com/internetarchive/heritrix3/compare/3.4.0-20210527...HEAD)
[Full Changelog](https://github.com/internetarchive/heritrix3/compare/3.4.0-20210527...3.4.0-20210617)
**Closed issues:**
@@ -10,6 +10,7 @@
**Merged pull requests:**
- Annotate nested sitemap links as sitemaps [\#398](https://github.com/internetarchive/heritrix3/pull/398) ([kris-sigur](https://github.com/kris-sigur))
- Update AMPQ client library to address security warning. [\#394](https://github.com/internetarchive/heritrix3/pull/394) ([anjackson](https://github.com/anjackson))
- Only update last checkpoint stats if the checkpoint completed, for \#392. [\#393](https://github.com/internetarchive/heritrix3/pull/393) ([anjackson](https://github.com/anjackson))
- Sync changelog with release. [\#391](https://github.com/internetarchive/heritrix3/pull/391) ([anjackson](https://github.com/anjackson))
+3 -10
View File
@@ -382,16 +382,6 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -412,6 +402,9 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
<doclint>none</doclint>
<additionalparam>-Xdoclint:none</additionalparam>
<jetty.version>9.4.37.v20210219</jetty.version>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.release>8</maven.compiler.release>
</properties>
<profiles>
<profile>