diff --git a/common/common-core/src/main/java/dk/netarkivet/common/Constants.java b/common/common-core/src/main/java/dk/netarkivet/common/Constants.java
index 7eb720bb5..4f995b3a7 100644
--- a/common/common-core/src/main/java/dk/netarkivet/common/Constants.java
+++ b/common/common-core/src/main/java/dk/netarkivet/common/Constants.java
@@ -72,7 +72,7 @@ public final class Constants {
* The code will try to read the heritrix version from the pom in the jar Manifest. This
* constant is only ever read as a fallback.
* */
- private static final String HERITRIX3_VERSION = "3.4.0-NAS-7.5-SNAPSHOT";
+ private static final String HERITRIX3_VERSION = "3.4.0-NAS-7.5.1-SNAPSHOT";
/**
* Read this much data when copying data from a file channel. Note that due to a bug in java, this should never be
diff --git a/deploy/deploy-core/src/main/resources/dk/netarkivet/deploy/complete_settings.xml b/deploy/deploy-core/src/main/resources/dk/netarkivet/deploy/complete_settings.xml
index 478e70557..d71eece6a 100644
--- a/deploy/deploy-core/src/main/resources/dk/netarkivet/deploy/complete_settings.xml
+++ b/deploy/deploy-core/src/main/resources/dk/netarkivet/deploy/complete_settings.xml
@@ -357,6 +357,7 @@
400000000
oldjobs
+ false
30
300
diff --git a/harvester/harvester-core/src/main/java/dk/netarkivet/harvester/HarvesterSettings.java b/harvester/harvester-core/src/main/java/dk/netarkivet/harvester/HarvesterSettings.java
index 648daaa1b..c95a013ff 100644
--- a/harvester/harvester-core/src/main/java/dk/netarkivet/harvester/HarvesterSettings.java
+++ b/harvester/harvester-core/src/main/java/dk/netarkivet/harvester/HarvesterSettings.java
@@ -276,6 +276,12 @@ public class HarvesterSettings {
* web servers.
*/
public static String CRAWLER_TIMEOUT_NON_RESPONDING = "settings.harvester.harvesting.heritrix.noresponseTimeout";
+
+ /**
+ * If true, upload failures will not cause a job to be marked as failed
+ */
+ public static String ALLOW_UPLOAD_FAILURES = "settings.harvester.harvesting.allowUploadFailures";
+
/**
* settings.harvester.monitor.refreshInterval:
* Time interval in seconds after which the harvest monitor pages will be automatically refreshed.
diff --git a/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/settings.xml b/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/settings.xml
index 6b64a2068..f6a06cbf1 100644
--- a/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/settings.xml
+++ b/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/settings.xml
@@ -98,6 +98,7 @@ National Library.
400000000
oldjobs
+ false
30
300
diff --git a/harvester/heritrix3/heritrix3-controller/src/main/java/dk/netarkivet/harvester/heritrix3/PostProcessing.java b/harvester/heritrix3/heritrix3-controller/src/main/java/dk/netarkivet/harvester/heritrix3/PostProcessing.java
index 903880da4..dfa2fe9cf 100644
--- a/harvester/heritrix3/heritrix3-controller/src/main/java/dk/netarkivet/harvester/heritrix3/PostProcessing.java
+++ b/harvester/heritrix3/heritrix3-controller/src/main/java/dk/netarkivet/harvester/heritrix3/PostProcessing.java
@@ -318,7 +318,11 @@ private void uploadFiles(List files, StringBuilder errorMessage, List1.1.5
- 3.4.0-NAS-7.5
+ 3.4.0-NAS-7.5.1-SNAPSHOT
1.0.5
1.8.0-20130411
2.0.0