From a5164dbceadcd16b2d8f42b2ada3f5cd46afcd69 Mon Sep 17 00:00:00 2001
From: Andrew Jackson <Andrew.Jackson@bl.uk>
Date: Thu, 17 Jun 2021 14:34:22 +0100
Subject: [PATCH 1/5] Update changelog.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81500b92..de4ddfea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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))

From 7368ded9c2363d2485dc62c6f0928a2096c65f5c Mon Sep 17 00:00:00 2001
From: Andrew Jackson <Andrew.Jackson@bl.uk>
Date: Thu, 17 Jun 2021 14:38:54 +0100
Subject: [PATCH 2/5] [maven-release-plugin] prepare release 3.4.0-20210617

---
 commons/pom.xml | 2 +-
 contrib/pom.xml | 2 +-
 dist/pom.xml    | 2 +-
 engine/pom.xml  | 2 +-
 modules/pom.xml | 2 +-
 pom.xml         | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 9628160d..595743e5 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.0-20210617</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.archive.heritrix</groupId>
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 13c6d3fb..1a6c3bac 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.0-20210617</version>
 	</parent>
 	<groupId>org.archive.heritrix</groupId>
 	<artifactId>heritrix-contrib</artifactId>
diff --git a/dist/pom.xml b/dist/pom.xml
index 9a7ddc07..24cb2e44 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.0-20210617</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.archive.heritrix</groupId>
diff --git a/engine/pom.xml b/engine/pom.xml
index 525296bc..31452f2e 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.0-20210617</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.archive.heritrix</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 93bf30e1..5ded67de 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.0-20210617</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.archive.heritrix</groupId>
diff --git a/pom.xml b/pom.xml
index d2ace0bf..57f34284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
 	<groupId>org.archive</groupId>
 	<!--This project is parent to all under 'projects' subdirectory-->
 	<artifactId>heritrix</artifactId>
-	<version>3.4.0-SNAPSHOT</version>
+	<version>3.4.0-20210617</version>
 	<packaging>pom</packaging>
 	<name>Heritrix 3</name>
 	<description>
@@ -32,7 +32,7 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
        <connection>scm:git:https://github.com/internetarchive/heritrix3.git</connection>
        <developerConnection>scm:git:https://github.com/internetarchive/heritrix3.git</developerConnection>
        <url>https://github.com/internetarchive/heritrix3</url>
-      <tag>HEAD</tag>
+      <tag>3.4.0-20210617</tag>
   </scm>            
 
 	<licenses>

From 3423cab6a6646f918ba95a84303eaace685a86c4 Mon Sep 17 00:00:00 2001
From: Andrew Jackson <Andrew.Jackson@bl.uk>
Date: Thu, 17 Jun 2021 14:39:00 +0100
Subject: [PATCH 3/5] [maven-release-plugin] prepare for next development
 iteration

---
 commons/pom.xml | 2 +-
 contrib/pom.xml | 2 +-
 dist/pom.xml    | 2 +-
 engine/pom.xml  | 2 +-
 modules/pom.xml | 2 +-
 pom.xml         | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 595743e5..9628160d 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-20210617</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.archive.heritrix</groupId>
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 1a6c3bac..13c6d3fb 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-20210617</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.archive.heritrix</groupId>
 	<artifactId>heritrix-contrib</artifactId>
diff --git a/dist/pom.xml b/dist/pom.xml
index 24cb2e44..9a7ddc07 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-20210617</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.archive.heritrix</groupId>
diff --git a/engine/pom.xml b/engine/pom.xml
index 31452f2e..525296bc 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-20210617</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.archive.heritrix</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 5ded67de..93bf30e1 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.archive</groupId>
 		<artifactId>heritrix</artifactId>
-		<version>3.4.0-20210617</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.archive.heritrix</groupId>
diff --git a/pom.xml b/pom.xml
index 57f34284..d2ace0bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
 	<groupId>org.archive</groupId>
 	<!--This project is parent to all under 'projects' subdirectory-->
 	<artifactId>heritrix</artifactId>
-	<version>3.4.0-20210617</version>
+	<version>3.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Heritrix 3</name>
 	<description>
@@ -32,7 +32,7 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
        <connection>scm:git:https://github.com/internetarchive/heritrix3.git</connection>
        <developerConnection>scm:git:https://github.com/internetarchive/heritrix3.git</developerConnection>
        <url>https://github.com/internetarchive/heritrix3</url>
-      <tag>3.4.0-20210617</tag>
+      <tag>HEAD</tag>
   </scm>            
 
 	<licenses>

From 18e877939844c0ec9ebc9b5515558b5cd056e6f3 Mon Sep 17 00:00:00 2001
From: Andrew Jackson <Andrew.Jackson@bl.uk>
Date: Thu, 17 Jun 2021 16:42:23 +0100
Subject: [PATCH 4/5] Updated changelog.

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de4ddfea..1610ab6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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:**
 

From 2007ddb00574e6038ca811dac26d95894f99778e Mon Sep 17 00:00:00 2001
From: Andrew Jackson <Andrew.Jackson@bl.uk>
Date: Thu, 17 Jun 2021 21:22:04 +0100
Subject: [PATCH 5/5] Switch to properties that enforce Java 8 compatibility.

---
 pom.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2ace0bf..15c23703 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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.3</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>