From 8002f5c61143d6dcfb50ccf8a2640710f3e28a47 Mon Sep 17 00:00:00 2001
From: Sebastian Nagel <snagel@apache.org>
Date: Thu, 11 Dec 2025 18:59:54 +0100
Subject: [PATCH 1/2] NUTCH-3137 Upgrade Nutch core dependencies

---
 build.xml   |  4 ++--
 ivy/ivy.xml | 52 ++++++++++++++++++++++++++--------------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/build.xml b/build.xml
index 278c19e257..73ca7428ce 100644
--- a/build.xml
+++ b/build.xml
@@ -40,11 +40,11 @@
 
   <property environment="env"/>
 
-  <property name="spotbugs.version" value="4.2.0" />
+  <property name="spotbugs.version" value="4.9.8" />
   <property name="spotbugs.home" value="${ivy.dir}/spotbugs-${spotbugs.version}" />
   <property name="spotbugs.jar" value="${spotbugs.home}/lib/spotbugs-ant.jar" />
 
-  <property name="apache-rat.version" value="0.16.1" />
+  <property name="apache-rat.version" value="0.17" />
   <property name="apache-rat.home" value="${ivy.dir}/apache-rat-${apache-rat.version}" />
   <property name="apache-rat.jar" value="${apache-rat.home}/apache-rat-${apache-rat.version}.jar" />
 
diff --git a/ivy/ivy.xml b/ivy/ivy.xml
index f149ce13d5..817ea2697c 100644
--- a/ivy/ivy.xml
+++ b/ivy/ivy.xml
@@ -38,21 +38,21 @@
 	</publications>
 
 	<dependencies>
-		<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.25.0" conf="*->master" />
-		<dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.25.0" conf="*->master" />
-		<dependency org="org.apache.logging.log4j" name="log4j-slf4j2-impl" rev="2.25.0" conf="*->master" />
+		<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.25.2" conf="*->master" />
+		<dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.25.2" conf="*->master" />
+		<dependency org="org.apache.logging.log4j" name="log4j-slf4j2-impl" rev="2.25.2" conf="*->master" />
 		<dependency org="org.slf4j" name="slf4j-api" rev="2.0.17" conf="*->master" />
 
-		<dependency org="org.apache.commons" name="commons-lang3" rev="3.17.0" conf="*->default" />
-		<dependency org="org.apache.commons" name="commons-collections4" rev="4.4" conf="*->master" />
+		<dependency org="org.apache.commons" name="commons-lang3" rev="3.20.0" conf="*->default" />
+		<dependency org="org.apache.commons" name="commons-collections4" rev="4.5.0" conf="*->master" />
 		<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.14" conf="*->master" />
 		<!-- commons-httpclient is still required -->
 		<dependency org="commons-httpclient" name="commons-httpclient" rev="3.1"/>
-		<dependency org="commons-codec" name="commons-codec" rev="1.18.0" conf="*->default" />
+		<dependency org="commons-codec" name="commons-codec" rev="1.20.0" conf="*->default" />
 
-		<dependency org="commons-io" name="commons-io" rev="2.16.1" conf="*->default" />
-		<dependency org="org.apache.commons" name="commons-compress" rev="1.27.1" conf="*->default" />
-		<dependency org="org.apache.commons" name="commons-jexl3" rev="3.5.0" conf="*->default" />
+		<dependency org="commons-io" name="commons-io" rev="2.21.0" conf="*->default" />
+		<dependency org="org.apache.commons" name="commons-compress" rev="1.28.0" conf="*->default" />
+		<dependency org="org.apache.commons" name="commons-jexl3" rev="3.6.0" conf="*->default" />
 		<dependency org="com.tdunning" name="t-digest" rev="3.3" />
 
 		<!-- Hadoop Dependencies -->
@@ -79,29 +79,29 @@
 		<dependency org="xml-apis" name="xml-apis" rev="1.4.01" /><!-- force this version as it is required by Tika -->
 		<dependency org="xerces" name="xercesImpl" rev="2.12.2" />
 
-		<dependency org="com.ibm.icu" name="icu4j" rev="77.1" />
+		<dependency org="com.ibm.icu" name="icu4j" rev="78.1" />
 
-		<dependency org="com.google.guava" name="guava" rev="33.4.8-jre" />
+		<dependency org="com.google.guava" name="guava" rev="33.5.0-jre" />
 
 		<dependency org="com.github.crawler-commons" name="crawler-commons" rev="1.4" />
 
-		<dependency org="com.google.code.gson" name="gson" rev="2.13.1"/>
+		<dependency org="com.google.code.gson" name="gson" rev="2.13.2"/>
 		<dependency org="com.martinkl.warc" name="warc-hadoop" rev="0.1.0">
 			<exclude module="hadoop-client" />
 		</dependency>
 
-		<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="3.6.7" conf="*->default" />
-		<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="3.6.7" conf="*->default" />
-		<dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="3.6.7" conf="*->default" />
-		<dependency org="org.apache.cxf" name="cxf-rt-transports-http-jetty" rev="3.6.7" conf="*->default" />
-		<dependency org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.6.7" conf="test->default" />
-		<dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.15.2" conf="*->default" />
-		<dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="2.15.2" conf="*->default" />
-		<dependency org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" rev="2.15.2" conf="*->default" />
-		<dependency org="com.fasterxml.jackson.jaxrs" name="jackson-jaxrs-json-provider" rev="2.15.2" conf="*->default" />
+		<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="3.6.9" conf="*->default" />
+		<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="3.6.9" conf="*->default" />
+		<dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="3.6.9" conf="*->default" />
+		<dependency org="org.apache.cxf" name="cxf-rt-transports-http-jetty" rev="3.6.9" conf="*->default" />
+		<dependency org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.6.9" conf="test->default" />
+		<dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.18.5" conf="*->default" />
+		<dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="2.18.5" conf="*->default" />
+		<dependency org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" rev="2.18.5" conf="*->default" />
+		<dependency org="com.fasterxml.jackson.jaxrs" name="jackson-jaxrs-json-provider" rev="2.18.5" conf="*->default" />
 
 		<!-- WARC artifacts needed -->
-		<dependency org="org.netpreserve.commons" name="webarchive-commons" rev="2.0.1" conf="*->default">
+		<dependency org="org.netpreserve.commons" name="webarchive-commons" rev="3.0.2" conf="*->default">
 			<exclude module="hadoop-core" />
 			<exclude org="com.google.guava" />
 			<exclude org="junit" />
@@ -118,13 +118,13 @@
 
         <dependency org="org.hamcrest" name="hamcrest" rev="3.0" conf="test->default"/>
         <!-- Required for <junitlauncher> task -->
-        <dependency org="org.junit.platform" name="junit-platform-launcher" rev="1.13.4" conf="test->default"/>
+        <dependency org="org.junit.platform" name="junit-platform-launcher" rev="1.14.1" conf="test->default"/>
         <!-- Required for JUnit 5 (Jupiter) test execution -->
-        <dependency org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.13.4" conf="test->default"/>
-        <dependency org="org.junit.jupiter" name="junit-jupiter-api" rev="5.13.4" conf="test->default"/>
+        <dependency org="org.junit.jupiter" name="junit-jupiter-engine" rev="5.14.1" conf="test->default"/>
+        <dependency org="org.junit.jupiter" name="junit-jupiter-api" rev="5.14.1" conf="test->default"/>
 
 		<!-- Jetty used to serve test pages for unit tests, but is also provided as dependency of Hadoop -->
-		<dependency org="org.eclipse.jetty" name="jetty-server" rev="10.0.25" conf="test->default">
+		<dependency org="org.eclipse.jetty" name="jetty-server" rev="12.1.5" conf="test->default">
 			<exclude org="ch.qos.reload4j" module="*" />
 			<exclude org="org.slf4j" module="slf4j-reload" />
 		</dependency>

From 69e9cbe5b6ddcfef1043eb35fecf8a724cdde2ef Mon Sep 17 00:00:00 2001
From: Sebastian Nagel <snagel@apache.org>
Date: Fri, 12 Dec 2025 18:17:33 +0100
Subject: [PATCH 2/2] NUTCH-3137 Upgrade Nutch core dependencies

Roll back to RAT 0.16,
address build failure caused by new RAT report format.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 73ca7428ce..90127d040f 100644
--- a/build.xml
+++ b/build.xml
@@ -44,7 +44,7 @@
   <property name="spotbugs.home" value="${ivy.dir}/spotbugs-${spotbugs.version}" />
   <property name="spotbugs.jar" value="${spotbugs.home}/lib/spotbugs-ant.jar" />
 
-  <property name="apache-rat.version" value="0.17" />
+  <property name="apache-rat.version" value="0.16" />
   <property name="apache-rat.home" value="${ivy.dir}/apache-rat-${apache-rat.version}" />
   <property name="apache-rat.jar" value="${apache-rat.home}/apache-rat-${apache-rat.version}.jar" />