Excavator: Upgrade dependencies

timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/TestableTimelockServer.java

@@ -27,6 +27,7 @@
 import com.google.common.collect.Streams;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.palantir.atlasdb.timelock.NamespacedClients.ProxyFactory;
 import com.palantir.atlasdb.timelock.api.MultiClientConjureTimelockService;
 import com.palantir.atlasdb.timelock.api.management.TimeLockManagementService;
@@ -71,7 +72,15 @@ public TimeLockServerHolder serverHolder() {
     }
 
     ListenableFuture<Void> killAsync() {
-        return serverHolder.kill();
+        ListenableFuture<Void> kill = serverHolder.kill();
+        kill.addListener(
+                () -> {
+                    // https://github.com/palantir/dialogue/issues/1119
+                    clientsByNamespace.clear();
+                    proxies.clearProxies();
+                },
+                MoreExecutors.directExecutor());
+        return kill;
     }
 
     void killSync() {

timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/ExceptionMatchers.java

@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.palantir.conjure.java.api.errors.QosException;
-import feign.RetryableException;
+import com.palantir.conjure.java.api.errors.UnknownRemoteException;
 
 public final class ExceptionMatchers {
 
@@ -27,6 +27,6 @@ private ExceptionMatchers() {}
     public static void isRetryableExceptionWhereLeaderCannotBeFound(Throwable throwable) {
         assertThat(throwable)
                 .hasRootCauseInstanceOf(QosException.RetryOther.class)
-                .isInstanceOf(RetryableException.class);
+                .isInstanceOf(UnknownRemoteException.class);
     }
 }

timelock-server/src/testCommon/java/com/palantir/atlasdb/timelock/util/TestProxies.java

@@ -66,6 +66,10 @@ int getPort(TimeLockServerHolder serverHolder) {
         abstract int getPort(TimeLockServerHolder serverHolder);
     }
 
+    public void clearProxies() {
+        proxies.clear();
+    }
+
     public <T> T singleNode(TimeLockServerHolder server, Class<T> serviceInterface, ProxyMode proxyMode) {
         return singleNode(server, serviceInterface, true, proxyMode);
     }