This is an automated email from the ASF dual-hosted git repository.
snagel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git
The following commit(s) were added to refs/heads/master by this push:
new 215993bc6 NUTCH-2596 Upgrade from org.mortbay.jetty to
org.eclipse.jetty - upgrade from org.mortbay.jetty 6.1.26 to org.eclipse.jetty
9.4.50 (Hadoop depends on 9.4.43) - remove obsolete dependency exclusions of
hadoop-common - upgrade Fetcher unit tests to use org.eclipse.jetty
215993bc6 is described below
commit 215993bc6fbc58c050251410d5a7b02e601d99b3
Author: Sebastian Nagel <sna...@apache.org>
AuthorDate: Thu Feb 23 15:46:28 2023 +0100
NUTCH-2596 Upgrade from org.mortbay.jetty to org.eclipse.jetty
- upgrade from org.mortbay.jetty 6.1.26 to org.eclipse.jetty 9.4.50
(Hadoop depends on 9.4.43)
- remove obsolete dependency exclusions of hadoop-common
- upgrade Fetcher unit tests to use org.eclipse.jetty
---
ivy/ivy.xml | 12 +++---------
src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java | 17 +++++++++--------
src/test/org/apache/nutch/fetcher/TestFetcher.java | 5 ++---
3 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/ivy/ivy.xml b/ivy/ivy.xml
index 36a32a809..269f521c8 100644
--- a/ivy/ivy.xml
+++ b/ivy/ivy.xml
@@ -50,14 +50,7 @@
<dependency org="com.tdunning" name="t-digest" rev="3.3" />
<!-- Hadoop Dependencies -->
- <dependency org="org.apache.hadoop" name="hadoop-common"
rev="3.3.4" conf="*->default">
- <exclude org="hsqldb" name="hsqldb" />
- <exclude org="net.sf.kosmosfs" name="kfs" />
- <exclude org="net.java.dev.jets3t" name="jets3t" />
- <exclude org="org.eclipse.jdt" name="core" />
- <exclude org="org.mortbay.jetty" name="jsp-*" />
- <exclude org="ant" name="ant" />
- </dependency>
+ <dependency org="org.apache.hadoop" name="hadoop-common"
rev="3.3.4" conf="*->default" />
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="3.3.4" conf="*->default" />
<dependency org="org.apache.hadoop"
name="hadoop-mapreduce-client-core" rev="3.3.4" conf="*->default" />
<dependency org="org.apache.hadoop"
name="hadoop-mapreduce-client-jobclient" rev="3.3.4" conf="*->default" />
@@ -112,7 +105,8 @@
<exclude org="log4j" module="log4j" />
</dependency>
- <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26"
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="9.4.50.v20221201" conf="test->default" />
<!--Added Because of Elasticsearch JEST client-->
<!--TODO refactor these to indexer-elastic-rest plugin somehow,
currently doesn't resolve correctly-->
diff --git a/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
b/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
index e271e88cf..87da8faf2 100644
--- a/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
+++ b/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
@@ -48,10 +48,10 @@ import org.apache.hadoop.mapreduce.Partitioner;
import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.Reducer.Context;
import org.apache.hadoop.security.Credentials;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.handler.ResourceHandler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.ResourceHandler;
public class CrawlDBTestUtil {
@@ -435,16 +435,17 @@ public class CrawlDBTestUtil {
*/
public static Server getServer(int port, String staticContent)
throws UnknownHostException {
- Server webServer = new org.mortbay.jetty.Server();
- SocketConnector listener = new SocketConnector();
+ Server webServer = new Server();
+
+ ServerConnector listener = new ServerConnector(webServer);
listener.setPort(port);
listener.setHost("127.0.0.1");
webServer.addConnector(listener);
ContextHandler staticContext = new ContextHandler();
staticContext.setContextPath("/");
staticContext.setResourceBase(staticContent);
- staticContext.addHandler(new ResourceHandler());
- webServer.addHandler(staticContext);
+ staticContext.insertHandler(new ResourceHandler());
+ webServer.insertHandler(staticContext);
return webServer;
}
}
diff --git a/src/test/org/apache/nutch/fetcher/TestFetcher.java
b/src/test/org/apache/nutch/fetcher/TestFetcher.java
index 245353fad..ecc135c52 100644
--- a/src/test/org/apache/nutch/fetcher/TestFetcher.java
+++ b/src/test/org/apache/nutch/fetcher/TestFetcher.java
@@ -36,7 +36,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.mortbay.jetty.Server;
+import org.eclipse.jetty.server.Server;
/**
* Basic fetcher test 1. generate seedlist 2. inject 3. generate 3. fetch 4.
@@ -180,8 +180,7 @@ public class TestFetcher {
}
private void addUrl(ArrayList<String> urls, String page) {
- urls.add("http://127.0.0.1:"; + server.getConnectors()[0].getPort() + "/"
- + page);
+ urls.add("http://127.0.0.1:"; + server.getURI().getPort() + "/" + page);
}
@Test
