diff --git a/commons/pom.xml b/commons/pom.xml index 7d07f854..78023a01 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -42,28 +42,22 @@ 2.6 compile - - commons-logging - commons-logging - 1.0.4 - compile - commons-net commons-net - 3.9.0 + 3.11.1 compile commons-io commons-io - 2.14.0 + 2.18.0 compile commons-codec commons-codec - 1.6 + 1.17.1 compile @@ -75,7 +69,7 @@ commons-cli commons-cli - 1.1 + 1.9.0 compile @@ -87,7 +81,7 @@ dnsjava dnsjava - 3.6.0 + 3.6.2 compile - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 org.glassfish.jaxb jaxb-runtime - 2.3.1 + 4.0.5 runtime 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; diff --git a/modules/pom.xml b/modules/pom.xml index c90e86e8..6687c7d8 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -82,23 +82,18 @@ com.github.crawler-commons crawler-commons - 1.0 + 1.4 com.github.bbottema java-socks-proxy-server - 1.1.0 + 4.1.2 test - - com.jcraft - jsch - 0.1.54 - org.apache.pdfbox pdfbox - 3.0.1 + 3.0.3 @@ -120,6 +115,6 @@ UTF-8 - 4.0.21 + 4.0.24 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 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); diff --git a/pom.xml b/pom.xml index 06371107..c58dc990 100644 --- a/pom.xml +++ b/pom.xml @@ -121,17 +121,17 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html org.apache.httpcomponents httpclient - 4.5.13 + 4.5.14 org.apache.httpcomponents httpmime - 4.5.13 + 4.5.14 junit junit - 4.13.1 + 4.13.2