You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ti...@apache.org on 2022/03/30 13:15:43 UTC
[curator] branch master updated: CURATOR-630 Upgrade jetty to 9.4.latest (#413)
This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/curator.git
The following commit(s) were added to refs/heads/master by this push:
new 5ca31e3 CURATOR-630 Upgrade jetty to 9.4.latest (#413)
5ca31e3 is described below
commit 5ca31e3520189fac3c0447e3083a76756a535723
Author: Horváth Dóra <47...@users.noreply.github.com>
AuthorDate: Wed Mar 30 15:15:35 2022 +0200
CURATOR-630 Upgrade jetty to 9.4.latest (#413)
---
curator-x-discovery-server/pom.xml | 4 ++--
.../server/jetty_jersey/TestMapsWithJersey.java | 16 ++++++++++------
.../server/jetty_jersey/TestObjectPayloadWithJersey.java | 16 ++++++++++------
.../server/jetty_jersey/TestStringsWithJersey.java | 16 ++++++++++------
.../server/jetty_resteasy/TestStringsWithRestEasy.java | 14 ++++++++++----
pom.xml | 6 +++---
6 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index f5c7f39..ae7b3cb 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -92,8 +92,8 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java
index 997cefe..2d95bd6 100644
--- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java
+++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java
@@ -40,12 +40,12 @@ import org.apache.curator.x.discovery.server.entity.ServiceInstances;
import org.apache.curator.x.discovery.server.entity.ServiceNames;
import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery;
import org.apache.curator.x.discovery.strategies.RandomStrategy;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
import java.util.Map;
@@ -90,12 +90,16 @@ public class TestMapsWithJersey
return singletons;
}
};
- ServletContainer container = new ServletContainer(application);
+ ServletContainer container = new ServletContainer(application);
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
- root.addServlet(new ServletHolder(container), "/*");
+ ServletContextHandler root = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ root.setContextPath("/");
+ final ServletHolder servletHolder = new ServletHolder(container);
+ root.addServlet(servletHolder, "/*");
+ servletHolder.setInitOrder(1);
+ server.setHandler(root);
server.start();
}
diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java
index 5ef1983..83dd155 100644
--- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java
+++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java
@@ -38,12 +38,12 @@ import org.apache.curator.x.discovery.server.entity.ServiceInstances;
import org.apache.curator.x.discovery.server.entity.ServiceNames;
import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery;
import org.apache.curator.x.discovery.strategies.RandomStrategy;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
import java.util.Set;
@@ -87,12 +87,16 @@ public class TestObjectPayloadWithJersey
return singletons;
}
};
- ServletContainer container = new ServletContainer(application);
+ ServletContainer container = new ServletContainer(application);
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
- root.addServlet(new ServletHolder(container), "/*");
+ ServletContextHandler root = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ root.setContextPath("/");
+ final ServletHolder servletHolder = new ServletHolder(container);
+ root.addServlet(servletHolder, "/*");
+ servletHolder.setInitOrder(1);
+ server.setHandler(root);
server.start();
}
diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java
index 3efbc00..a86093e 100644
--- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java
+++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java
@@ -39,12 +39,12 @@ import org.apache.curator.x.discovery.server.entity.ServiceInstances;
import org.apache.curator.x.discovery.server.entity.ServiceNames;
import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery;
import org.apache.curator.x.discovery.strategies.RandomStrategy;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
import java.util.Set;
@@ -88,12 +88,16 @@ public class TestStringsWithJersey
return singletons;
}
};
- ServletContainer container = new ServletContainer(application);
+ ServletContainer container = new ServletContainer(application);
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
- root.addServlet(new ServletHolder(container), "/*");
+ ServletContextHandler root = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ root.setContextPath("/");
+ final ServletHolder servletHolder = new ServletHolder(container);
+ root.addServlet(servletHolder, "/*");
+ servletHolder.setInitOrder(1);
+ server.setHandler(root);
server.start();
}
diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
index a6682db..e58f66e 100644
--- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
+++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
@@ -27,15 +27,15 @@ import org.apache.curator.x.discovery.ServiceInstance;
import org.apache.curator.x.discovery.ServiceType;
import org.apache.curator.x.discovery.server.entity.ServiceInstances;
import org.apache.curator.x.discovery.server.entity.ServiceNames;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
import javax.ws.rs.core.MediaType;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -65,10 +65,16 @@ public class TestStringsWithRestEasy
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
+
+ ServletContextHandler root = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ root.setContextPath("/");
+ root.setServer(server);
+ root.setContextPath("/");
root.getInitParams().put("javax.ws.rs.Application", RestEasyApplication.class.getName());
root.addServlet(new ServletHolder(dispatcher), "/*");
root.addEventListener(new ResteasyBootstrap());
+
+ server.setHandler(root);
server.start();
}
diff --git a/pom.xml b/pom.xml
index f20689b..bda4715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<!-- See https://stackoverflow.com/questions/43574426#comment93992044_43574427 -->
<jaxb-version>2.2.11</jaxb-version>
<javax-activation-version>1.1.1</javax-activation-version>
- <jetty-version>6.1.26</jetty-version>
+ <jetty-version>9.4.45.v20220203</jetty-version>
<scannotation-version>1.0.2</scannotation-version>
<!-- resteasy-jaxrs dependency cannot be higher than 2.x for compatibility with Jersey 1.x -->
<resteasy-jaxrs-version>2.3.5.Final</resteasy-jaxrs-version>
@@ -510,8 +510,8 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
<version>${jetty-version}</version>
</dependency>