From e897a4f0ab85eda4fe72cfb0a6c6f851adce0c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Rydstr=C3=B6m?= <jrydstrom@invidi.com>
Date: Wed, 23 Oct 2019 13:59:58 +0200
Subject: [PATCH] Bump Guava to make reflections work with Java 11

With Java 11 and Guava 14.0.x `com.google.common.reflectClassPath.from(ClassLoader.getSystemClassLoader()).getAllClasses()` returns an empty `Set`. From a consumers perspective it is not possible to upgrade Guava on that side since `rdi-client-java` depends on a version of Guava which has had a non-compatible API change.

Resolves: metamx/rdi-client-java#7
---
 core/src/main/java/com/metamx/rdiclient/RdiClientImpl.java | 2 +-
 pom.xml                                                    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/metamx/rdiclient/RdiClientImpl.java b/core/src/main/java/com/metamx/rdiclient/RdiClientImpl.java
index fce92f5..01175c2 100644
--- a/core/src/main/java/com/metamx/rdiclient/RdiClientImpl.java
+++ b/core/src/main/java/com/metamx/rdiclient/RdiClientImpl.java
@@ -390,7 +390,7 @@ private ListenableFuture<HttpResponseStatus> retryingPost(
   )
   {
     final SettableFuture<HttpResponseStatus> retVal = SettableFuture.create();
-    final ListenableFuture<HttpResponseStatus> response = Futures.transform(
+    final ListenableFuture<HttpResponseStatus> response = Futures.transformAsync(
         httpClient.go(request, new StatusResponseHandler(Charsets.UTF_8)),
         new AsyncFunction<StatusResponseHolder, HttpResponseStatus>()
         {
diff --git a/pom.xml b/pom.xml
index 5e0a36c..a3021ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,11 @@
         <artifactId>validation-api</artifactId>
         <version>1.0.0.GA</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>25.0-jre</version>
+      </dependency>
 
       <!-- Jackson -->
       <dependency>