Skip to content

Commit 6584664

Browse files
Mat Rchingor13
authored andcommitted
deps: update jetty to 8.2 (#377)
1 parent a96731d commit 6584664

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

google-oauth-client-jetty/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
<artifactId>google-oauth-client-java6</artifactId>
8888
</dependency>
8989
<dependency>
90-
<groupId>org.mortbay.jetty</groupId>
91-
<artifactId>jetty</artifactId>
90+
<groupId>org.eclipse.jetty</groupId>
91+
<artifactId>jetty-server</artifactId>
9292
</dependency>
9393
<dependency>
9494
<groupId>junit</groupId>

google-oauth-client-jetty/src/main/java/com/google/api/client/extensions/jetty/auth/oauth2/LocalServerReceiver.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import java.util.concurrent.Semaphore;
2222
import javax.servlet.http.HttpServletRequest;
2323
import javax.servlet.http.HttpServletResponse;
24-
import org.mortbay.jetty.Connector;
25-
import org.mortbay.jetty.Request;
26-
import org.mortbay.jetty.Server;
27-
import org.mortbay.jetty.handler.AbstractHandler;
24+
import org.eclipse.jetty.server.Connector;
25+
import org.eclipse.jetty.server.Request;
26+
import org.eclipse.jetty.server.Server;
27+
import org.eclipse.jetty.server.handler.AbstractHandler;
2828

2929
/**
3030
* OAuth 2.0 verification code receiver that runs a Jetty server on a free port, waiting for a
@@ -118,7 +118,7 @@ public String getRedirectUri() throws IOException {
118118
server = new Server(port != -1 ? port : 0);
119119
Connector connector = server.getConnectors()[0];
120120
connector.setHost(host);
121-
server.addHandler(new CallbackHandler());
121+
server.setHandler(new CallbackHandler());
122122
try {
123123
server.start();
124124
port = connector.getLocalPort();
@@ -254,7 +254,8 @@ class CallbackHandler extends AbstractHandler {
254254

255255
@Override
256256
public void handle(
257-
String target, HttpServletRequest request, HttpServletResponse response, int dispatch)
257+
String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response
258+
)
258259
throws IOException {
259260
if (!callbackPath.equals(target)) {
260261
return;

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@
151151
<version>${project.version}</version>
152152
</dependency>
153153
<dependency>
154-
<groupId>org.mortbay.jetty</groupId>
155-
<artifactId>jetty</artifactId>
154+
<groupId>org.eclipse.jetty</groupId>
155+
<artifactId>jetty-server</artifactId>
156156
<version>${project.jetty.version}</version>
157157
</dependency>
158158
<dependency>
@@ -449,7 +449,7 @@
449449
<project.gson.version>2.1</project.gson.version>
450450
<project.jackson-core-asl.version>1.9.13</project.jackson-core-asl.version>
451451
<project.jackson-core2.version>2.9.6</project.jackson-core2.version>
452-
<project.jetty.version>6.1.26</project.jetty.version>
452+
<project.jetty.version>8.2.0.v20160908</project.jetty.version>
453453
<project.protobuf-java.version>2.6.1</project.protobuf-java.version>
454454
<project.guava.version>28.1-android</project.guava.version>
455455
<project.xpp3.version>1.1.4c</project.xpp3.version>

0 commit comments

Comments
 (0)