From 6b2d9eabe83f6a0fc61bb7a4da9dd3749037a065 Mon Sep 17 00:00:00 2001
From: Sebastian Nagel <sebastian@commoncrawl.org>
Date: Wed, 8 Jan 2025 18:08:47 +0100
Subject: [PATCH] Upgrade webarchive-commons dependency (1.1.11 -> 1.3.0)

---
 ivy/ivy.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ivy/ivy.xml b/ivy/ivy.xml
index 8c9b20b68..8a6fa3d32 100644
--- a/ivy/ivy.xml
+++ b/ivy/ivy.xml
@@ -113,18 +113,24 @@
 		<dependency org="com.fasterxml.jackson.jaxrs" name="jackson-jaxrs-json-provider" rev="2.15.2" conf="*->default" />
 
 		<!-- WARC artifacts needed -->
-		<dependency org="org.netpreserve.commons" name="webarchive-commons" rev="1.1.11" conf="*->default">
-			<exclude module="hadoop-core" />
+		<dependency org="org.netpreserve.commons" name="webarchive-commons" rev="1.3.0" conf="*->default">
+			<exclude module="hadoop-common" />
+			<exclude module="hadoop-mapreduce-client-core" />
 			<exclude org="com.google.guava" />
 			<exclude org="junit" />
 			<!-- Exclude dependencies with incompatible license (see https://www.apache.org/legal/resolved.html#category-x) -->
-			<exclude org="org.json" /><!-- JSON License -->
+			<!--
+					JSON License, see
+					https://lists.apache.org/thread/2zxx56kk3j4ql5otqkrpsjmqxxp8jzoh
+					https://issues.apache.org/jira/browse/LEGAL-245
+					https://issues.apache.org/jira/browse/LEGAL-666
+			-->
+			<exclude org="org.json" />
 			<!--
 				Exclusion of the following dependencies disables support of WARC generation by
 				"bin/nutch commoncrawldump -warc ..."
 				Please remove these exclusion and recompile Nutch to generate WARC files using the tool "commoncrawldump".
 			-->
-			<exclude org="it.unimi.dsi" module="dsiutils" /><!-- LGPL 2.1 -->
 			<exclude org="org.gnu.inet" module="libidn" /><!-- LGPL 2.1 -->
 		</dependency>