From c2a6bb558083853265e724acfdda5c844c2574ae Mon Sep 17 00:00:00 2001 From: Eli Bishop Date: Tue, 7 Apr 2020 15:27:10 -0700 Subject: [PATCH 1/2] update to okhttp 4.5.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6e8c34f..5155c27 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ allprojects { } ext.versions = [ - "okhttp": "4.4.1", + "okhttp": "4.5.0", "slf4j": "1.7.22" ] From 439b9ff0511a96bfc2cc1b793e361b67e1815e39 Mon Sep 17 00:00:00 2001 From: Eli Bishop Date: Tue, 7 Apr 2020 15:59:22 -0700 Subject: [PATCH 2/2] longer timeout for cleaner shutdown of test servers --- src/test/java/com/launchdarkly/eventsource/StubServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/launchdarkly/eventsource/StubServer.java b/src/test/java/com/launchdarkly/eventsource/StubServer.java index 5ec8936..8a228c6 100644 --- a/src/test/java/com/launchdarkly/eventsource/StubServer.java +++ b/src/test/java/com/launchdarkly/eventsource/StubServer.java @@ -59,7 +59,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques baseRequest.setHandled(true); } }); - server.setStopTimeout(1); // without this, Jetty does not interrupt worker threads on shutdown + server.setStopTimeout(100); // without this, Jetty does not interrupt worker threads on shutdown try { server.start();