From a93761d0d5e1a29984587ea8c5e4b5929909c433 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 11:28:50 +0900
Subject: [PATCH 01/23] Bump pdfbox from 3.0.1 to 3.0.3

---
 modules/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pom.xml b/modules/pom.xml
index c90e86e8..59fcfeec 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -98,7 +98,7 @@
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
 			<artifactId>pdfbox</artifactId>
-			<version>3.0.1</version>
+			<version>3.0.3</version>
 		</dependency>
 	</dependencies>
 	<build>

From 4fde0945e446937b518d58dd4cf3c0b722aed87d Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 11:34:49 +0900
Subject: [PATCH 02/23] Bump kryo from 5.6.0 to 5.6.2

---
 commons/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 0bfa9d8e..4de309c0 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -145,7 +145,7 @@
 		<dependency>
 			<groupId>com.esotericsoftware</groupId>
 			<artifactId>kryo</artifactId>
-			<version>5.6.0</version>
+			<version>5.6.2</version>
 		</dependency>
 
 		<dependency>

From da67120347f1c183fff43ce96c3b7d22bae08e15 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 11:37:24 +0900
Subject: [PATCH 03/23] Bump commons-net from 3.9.0 to 3.11.1

---
 commons/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 4de309c0..f216e706 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -51,7 +51,7 @@
 		<dependency>
 			<groupId>commons-net</groupId>
 			<artifactId>commons-net</artifactId>
-			<version>3.9.0</version>
+			<version>3.11.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

From d5fbb5ab89c3d8f7d99e824d96b27a15b72347d9 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 11:39:46 +0900
Subject: [PATCH 04/23] Bump commons-codec from 1.6 to 1.17.1

---
 commons/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index f216e706..48e3398a 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.6</version>
+			<version>1.17.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

From fdab1d7e0557d811e5feeed54c90b44816f17a97 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 11:43:23 +0900
Subject: [PATCH 05/23] Bump dnsjava from 3.6.0 to 3.6.2

---
 commons/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 48e3398a..d162752d 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -87,7 +87,7 @@
 		<dependency>
 			<groupId>dnsjava</groupId>
 			<artifactId>dnsjava</artifactId>
-			<version>3.6.0</version>
+			<version>3.6.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<!--

From 631620c92be3aa76555e9c876969566a043a1d59 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 11:47:39 +0900
Subject: [PATCH 06/23] Bump groovy from 4.0.21 to 4.0.24

---
 modules/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pom.xml b/modules/pom.xml
index 59fcfeec..4ada7b3a 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -120,6 +120,6 @@
 	</build>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<groovy.version>4.0.21</groovy.version>
+		<groovy.version>4.0.24</groovy.version>
 	</properties>
 </project>

From 3ac2cedc8e1278084d48f7a09f08aee278c792a4 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 13:30:06 +0900
Subject: [PATCH 07/23] Bump junit from 4.13.1 to 4.13.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 06371107..c5154899 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.13.1</version>
+				<version>4.13.2</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

From 4391f039a2ff41f984ac94521adf7419bf90d58e Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 13:32:11 +0900
Subject: [PATCH 08/23] Bump httpcomponents from 4.5.13 to 4.5.14

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c5154899..c58dc990 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,12 +121,12 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>
-				<version>4.5.13</version>
+				<version>4.5.14</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpmime</artifactId>
-				<version>4.5.13</version>
+				<version>4.5.14</version>
 			</dependency>
 			<dependency>
 				<groupId>junit</groupId>

From 9a4e3c37e8f327080b2cd19bbc24049e8cb9a038 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 13:37:27 +0900
Subject: [PATCH 09/23] Remove redundant pdfbox dependency declaration from
 heritrix-contrib

It's already pulled in via heritrix-modules, so we don't need to
declare it again here.
---
 contrib/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/contrib/pom.xml b/contrib/pom.xml
index 5e55a957..d14e60c6 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -29,11 +29,6 @@
 			<artifactId>amqp-client</artifactId>
 			<version>5.18.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.pdfbox</groupId>
-			<artifactId>pdfbox</artifactId>
-			<version>3.0.1</version>
-		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>
 			<artifactId>easymock</artifactId>

From faf26adbb52dc1ef0ab50212ef09a4847af8c7a4 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 13:46:37 +0900
Subject: [PATCH 10/23] Bump jsch from 0.1.54 (jcraft) to 0.2.21 (mwiede fork)

The original project has been unmaintained since 2018 and doesn't
support the algorithms to connect to current versions of openssh.
---
 commons/pom.xml | 4 ++--
 modules/pom.xml | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index d162752d..9572f976 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -155,9 +155,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.jcraft</groupId>
+			<groupId>com.github.mwiede</groupId>
 			<artifactId>jsch</artifactId>
-			<version>0.1.54</version>
+			<version>0.2.21</version>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/modules/pom.xml b/modules/pom.xml
index 4ada7b3a..0c93d567 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -90,11 +90,6 @@
 			<version>1.1.0</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.jcraft</groupId>
-			<artifactId>jsch</artifactId>
-			<version>0.1.54</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
 			<artifactId>pdfbox</artifactId>

From add3ef58f7aea36bf1582ad56b2e99f085144877 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 13:48:02 +0900
Subject: [PATCH 11/23] Bump commons-io from 2.14.0 to 2.18.0

---
 commons/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 9572f976..8e2dfd6f 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.14.0</version>
+			<version>2.18.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

From ec7b03446cbe5feb0beb9f94f401925e5e4e66fe Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 13:50:04 +0900
Subject: [PATCH 12/23] Bump commons-cli from 1.1 to 1.9.0

---
 commons/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 8e2dfd6f..d8ddf267 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -75,7 +75,7 @@
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.1</version>
+			<version>1.9.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

From 577874752714c6bd8c89f7afd5544adef3e527e8 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 13:54:27 +0900
Subject: [PATCH 13/23] Bump crawler-commons from 1.0 to 1.4

---
 modules/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pom.xml b/modules/pom.xml
index 0c93d567..36ef257a 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -82,7 +82,7 @@
 		<dependency>
 			<groupId>com.github.crawler-commons</groupId>
 			<artifactId>crawler-commons</artifactId>
-			<version>1.0</version>
+			<version>1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.bbottema</groupId>

From 6ff95c1bed42a183628c2237d66108ea2e5abd89 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 13:59:04 +0900
Subject: [PATCH 14/23] Remove redundant commons-codec dependency declaration
 from contrib

---
 contrib/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/contrib/pom.xml b/contrib/pom.xml
index d14e60c6..69221031 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -55,11 +55,6 @@
 			<artifactId>Java-WebSocket</artifactId>
 			<version>1.5.2</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.16.1</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

From 6a498014f3610e83cb7e1337887ba45f89d11a79 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 14:00:35 +0900
Subject: [PATCH 15/23] Bump gson from 2.8.9 to 2.11.0

---
 contrib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/pom.xml b/contrib/pom.xml
index 69221031..0d77692c 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.9</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.java-websocket</groupId>

From dceaa8517efda87bdb3758cc5fb0dafa232e7654 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 14:01:14 +0900
Subject: [PATCH 16/23] Bump rabbitmq amqp-client from 5.18.0 to 5.23.0

---
 contrib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/pom.xml b/contrib/pom.xml
index 0d77692c..d4b0e662 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>com.rabbitmq</groupId>
 			<artifactId>amqp-client</artifactId>
-			<version>5.18.0</version>
+			<version>5.23.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>

From ea0b4611ca69b1489b4271aee2d7ebc297a87e50 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 14:03:10 +0900
Subject: [PATCH 17/23] Bump kafka-clients from 3.8.0 to 3.9.0

---
 contrib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/pom.xml b/contrib/pom.xml
index d4b0e662..9098d591 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>org.apache.kafka</groupId>
 			<artifactId>kafka-clients</artifactId>
-			<version>3.8.0</version>
+			<version>3.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.rethinkdb</groupId>

From 9c799fdfad1d5c95a6bb34506397a9ae4763dd1e Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 14:04:03 +0900
Subject: [PATCH 18/23] Remove unused java-websocket dependency

---
 contrib/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/contrib/pom.xml b/contrib/pom.xml
index 9098d591..c7d7d8c9 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -50,11 +50,6 @@
 			<artifactId>gson</artifactId>
 			<version>2.11.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.java-websocket</groupId>
-			<artifactId>Java-WebSocket</artifactId>
-			<version>1.5.2</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

From d5b4391cce28f8e612670847664e353d0eda785f Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 14:14:55 +0900
Subject: [PATCH 19/23] Bump java-socks-proxy-server from 1.1.0 to 4.1.2

---
 modules/pom.xml                                              | 2 +-
 .../test/java/org/archive/modules/fetcher/FetchHTTPTest.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/pom.xml b/modules/pom.xml
index 36ef257a..6687c7d8 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -87,7 +87,7 @@
 		<dependency>
 			<groupId>com.github.bbottema</groupId>
 			<artifactId>java-socks-proxy-server</artifactId>
-			<version>1.1.0</version>
+			<version>4.1.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java b/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java
index 98ad98b0..61f13c88 100644
--- a/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java
+++ b/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java
@@ -984,7 +984,7 @@ public class FetchHTTPTest {
 
     protected FetchHTTP makeSocksModule() throws Exception {
         // configure our test server
-        socksServer = new SocksServer();
+        socksServer = new SocksServer(7800);
 
 
         // SocksServers opens the socket on a background thread, so we supply a socket factory
@@ -992,7 +992,7 @@ public class FetchHTTPTest {
         // occurs when binding. This works around a race where we connect to the server before
         // it is listening.
         CompletableFuture<Void> socksServerStartedFuture = new CompletableFuture<>();
-        socksServer.start(7800, new ServerSocketFactory() {
+        socksServer.setFactory(new ServerSocketFactory() {
             ServerSocketFactory defaultSocketFactory = ServerSocketFactory.getDefault();
 
             @Override
@@ -1017,6 +1017,7 @@ public class FetchHTTPTest {
                 }
             }
         });
+        socksServer.start();
         socksServerStartedFuture.get(30, TimeUnit.SECONDS);
 
         FetchHTTP fetchHttp = newSocksTestFetchHttp(getUserAgentString(), "localhost", 7800);

From 1ef2a52a6151ca9c2addaea8218e6bdd7062b453 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 14:16:30 +0900
Subject: [PATCH 20/23] Bump easymock from 3.1 to 5.5.0

---
 contrib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/pom.xml b/contrib/pom.xml
index c7d7d8c9..27bb52ae 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -32,7 +32,7 @@
 		<dependency>
 			<groupId>org.easymock</groupId>
 			<artifactId>easymock</artifactId>
-			<version>3.1</version>
+			<version>5.5.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

From bd5fc39d9cc31f9f26fa23d9f2f64e0dca4a9b95 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 14:46:22 +0900
Subject: [PATCH 21/23] Remove direct dependency on commons-logging

The rest of Heritrix uses Java logging. It still gets pulled in
transitively but at least we don't need to manage the version directly.
---
 commons/pom.xml                                  |  6 ------
 .../modules/recrawl/FetchHistoryHelper.java      |  5 +----
 .../recrawl/wbm/WbmPersistLoadProcessor.java     | 16 ++++++++--------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index d8ddf267..0863d163 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -42,12 +42,6 @@
 			<version>2.6</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
-			<scope>compile</scope>
-		</dependency>
 		<dependency>
 			<groupId>commons-net</groupId>
 			<artifactId>commons-net</artifactId>
diff --git a/contrib/src/main/java/org/archive/modules/recrawl/FetchHistoryHelper.java b/contrib/src/main/java/org/archive/modules/recrawl/FetchHistoryHelper.java
index 7719c288..dc24b634 100644
--- a/contrib/src/main/java/org/archive/modules/recrawl/FetchHistoryHelper.java
+++ b/contrib/src/main/java/org/archive/modules/recrawl/FetchHistoryHelper.java
@@ -21,8 +21,6 @@ package org.archive.modules.recrawl;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.archive.modules.CrawlURI;
 
 /**
@@ -32,8 +30,7 @@ import org.archive.modules.CrawlURI;
  *
  */
 public class FetchHistoryHelper {
-  private static final Log logger = LogFactory.getLog(FetchHistoryHelper.class);
-  /**
+    /**
    * key for storing timestamp in crawl history map.
    */
   public static final String A_TIMESTAMP = ".ts";
diff --git a/contrib/src/main/java/org/archive/modules/recrawl/wbm/WbmPersistLoadProcessor.java b/contrib/src/main/java/org/archive/modules/recrawl/wbm/WbmPersistLoadProcessor.java
index b3748c3f..7faa7ba2 100644
--- a/contrib/src/main/java/org/archive/modules/recrawl/wbm/WbmPersistLoadProcessor.java
+++ b/contrib/src/main/java/org/archive/modules/recrawl/wbm/WbmPersistLoadProcessor.java
@@ -34,8 +34,6 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpRequest;
@@ -57,6 +55,8 @@ import org.archive.modules.recrawl.RecrawlAttributeConstants;
 import org.archive.util.ArchiveUtils;
 import org.archive.util.DateUtils;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * A {@link Processor} for retrieving recrawl info from remote Wayback Machine index.
  * This is currently in the early stage of experiment. Both low-level protocol and WBM API
@@ -69,7 +69,7 @@ import org.archive.util.DateUtils;
  * @author Kenji Nagahashi.
  */
 public class WbmPersistLoadProcessor extends Processor {
-    private static final Log log = LogFactory.getLog(WbmPersistLoadProcessor.class);
+    private static final System.Logger log = System.getLogger(WbmPersistLoadProcessor.class.getName());
 
     private HttpClient client;
     private PoolingHttpClientConnectionManager conman;
@@ -415,7 +415,7 @@ public class WbmPersistLoadProcessor extends Processor {
                 cumulativeFetchTime.addAndGet(System.currentTimeMillis() - t0);
                 StatusLine sl = resp.getStatusLine();
                 if (sl.getStatusCode() != 200) {
-                    log.error("GET " + url + " failed with status=" + sl.getStatusCode() + " " + sl.getReasonPhrase());
+                    log.log(ERROR, "GET " + url + " failed with status=" + sl.getStatusCode() + " " + sl.getReasonPhrase());
                     entity = resp.getEntity();
                     entity.getContent().close();
                     entity = null;
@@ -423,9 +423,9 @@ public class WbmPersistLoadProcessor extends Processor {
                 }
                 entity = resp.getEntity();
             } catch (IOException ex) {
-                log.error("GEt " + url + " failed with error " + ex.getMessage());
+                log.log(ERROR, "GEt " + url + " failed with error " + ex.getMessage());
             } catch (Exception ex) {
-                log.error("GET " + url + " failed with error ", ex);
+                log.log(ERROR, "GET " + url + " failed with error ", ex);
             }
         } while (entity == null && ++attempts < 3);
         if (entity == null) {
@@ -440,7 +440,7 @@ public class WbmPersistLoadProcessor extends Processor {
         try {
             is = getCDX(curi.toString());
         } catch (IOException ex) {
-            log.error(ex.getMessage());
+            log.log(ERROR, ex.getMessage());
             errorCount.incrementAndGet();
             return ProcessResult.PROCEED;
         }
@@ -448,7 +448,7 @@ public class WbmPersistLoadProcessor extends Processor {
         try {
             info = getLastCrawl(is);
         } catch (IOException ex) {
-            log.error("error parsing response", ex);
+            log.log(ERROR, "error parsing response", ex);
         } finally {
             if (is != null)
                 ArchiveUtils.closeQuietly(is);

From 0a215f646763afca57c96759441c7cd6e3464ba7 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 15:11:56 +0900
Subject: [PATCH 22/23] Bump jaxb-runtime from 2.3.1 to 4.0.5

---
 engine/pom.xml                                            | 8 ++++----
 .../java/org/archive/crawler/restlet/XmlMarshaller.java   | 6 +++---
 .../org/archive/crawler/restlet/models/ScriptModel.java   | 4 ++--
 .../org/archive/crawler/restlet/XmlMarshallerTest.java    | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/engine/pom.xml b/engine/pom.xml
index 6ce7b4f0..79a5b943 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -72,14 +72,14 @@
 		</dependency>
 		<!-- jaxb is no longer included in jdk11+ -->
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.3.1</version>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>2.3.1</version>
+			<version>4.0.5</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
diff --git a/engine/src/main/java/org/archive/crawler/restlet/XmlMarshaller.java b/engine/src/main/java/org/archive/crawler/restlet/XmlMarshaller.java
index 176204c6..0452754d 100644
--- a/engine/src/main/java/org/archive/crawler/restlet/XmlMarshaller.java
+++ b/engine/src/main/java/org/archive/crawler/restlet/XmlMarshaller.java
@@ -31,9 +31,9 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.commons.lang.StringUtils;
 import org.restlet.ext.xml.XmlWriter;
diff --git a/engine/src/main/java/org/archive/crawler/restlet/models/ScriptModel.java b/engine/src/main/java/org/archive/crawler/restlet/models/ScriptModel.java
index 0fa5a970..70f2739c 100644
--- a/engine/src/main/java/org/archive/crawler/restlet/models/ScriptModel.java
+++ b/engine/src/main/java/org/archive/crawler/restlet/models/ScriptModel.java
@@ -6,8 +6,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.archive.crawler.restlet.ScriptingConsole;
 
diff --git a/engine/src/test/java/org/archive/crawler/restlet/XmlMarshallerTest.java b/engine/src/test/java/org/archive/crawler/restlet/XmlMarshallerTest.java
index 331e0588..71e27ae9 100644
--- a/engine/src/test/java/org/archive/crawler/restlet/XmlMarshallerTest.java
+++ b/engine/src/test/java/org/archive/crawler/restlet/XmlMarshallerTest.java
@@ -4,8 +4,8 @@ import java.io.StringWriter;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import junit.framework.TestCase;
 

From 6b1047385ec09e81db38f52aee3bdd45c6486e00 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 29 Nov 2024 17:13:14 +0900
Subject: [PATCH 23/23] Bump webarchive-commons from 1.1.10 to 1.2.0

---
 commons/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 0863d163..486edd1c 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -145,7 +145,7 @@
 		<dependency>
 			<groupId>org.netpreserve.commons</groupId>
 			<artifactId>webarchive-commons</artifactId>
-			<version>1.1.10</version>
+			<version>1.2.0</version>
 		</dependency>
 
 		<dependency>