chore(versions): Update dependencies versions

algolia · Aug 23, 2017 · ee37f54 · ee37f54
1 parent bdf6f5f
commit ee37f54
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/algoliasearch-common/src/test/java/com/algolia/search/AsyncAlgoliaIntegrationTest.java b/algoliasearch-common/src/test/java/com/algolia/search/AsyncAlgoliaIntegrationTest.java
@@ -2,6 +2,7 @@
 
 import com.algolia.search.objects.tasks.async.AsyncGenericTask;
 import org.assertj.core.api.AbstractListAssert;
+import org.assertj.core.api.ListAssert;
 import org.junit.Before;
 
 import java.util.List;
@@ -30,7 +31,7 @@ public void checkEnvVariables() throws Exception {
 
   public abstract AsyncAPIClient createInstance(String appId, String apiKey);
 
-  protected <T> AbstractListAssert<?, ? extends List<? extends T>, T> futureAssertThat(CompletableFuture<List<T>> future) throws Exception {
+  protected <T> ListAssert<T> futureAssertThat(CompletableFuture<List<T>> future) throws Exception {
     return assertThat(future.get(WAIT_TIME_IN_SECONDS, SECONDS));
   }
 

diff --git a/algoliasearch/src/main/java/com/algolia/search/TimeoutableHostNameResolver.java b/algoliasearch/src/main/java/com/algolia/search/TimeoutableHostNameResolver.java
@@ -6,6 +6,7 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 class TimeoutableHostNameResolver implements DnsResolver {
@@ -19,17 +20,16 @@ class TimeoutableHostNameResolver implements DnsResolver {
 
   TimeoutableHostNameResolver(long timeout) {
     this.timeout = timeout;
-    this.timeLimiter = new SimpleTimeLimiter();
+    this.timeLimiter = SimpleTimeLimiter.create(Executors.newCachedThreadPool());
   }
 
   @Override
   public InetAddress[] resolve(String hostname) throws UnknownHostException {
     try {
-      return timeLimiter.callWithTimeout(
+      return timeLimiter.callUninterruptiblyWithTimeout(
         () -> new InetAddress[]{InetAddress.getByName(hostname)},
         timeout,
-        TimeUnit.MILLISECONDS,
-        true
+        TimeUnit.MILLISECONDS
       );
     } catch (Exception e) {
       throw new UnknownHostException(hostname);

diff --git a/pom.xml b/pom.xml
@@ -12,14 +12,17 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <google-http-client.version>1.22.0</google-http-client.version>
-    <apache-http-client.version>4.5.2</apache-http-client.version>
-    <guava.version>19.0</guava.version>
-    <jackson.version>2.7.4</jackson.version>
-    <jsr305.version>3.0.1</jsr305.version>
+    <apache-http-client.version>4.5.3</apache-http-client.version>
+    <guava.version>22.0</guava.version>
+    <jackson.version>2.9.0</jackson.version>
+    <jsr305.version>3.0.2</jsr305.version>
     <url-builder.version>1.1.0</url-builder.version>
-    <appengine-api.version>1.9.38</appengine-api.version>
-    <future-converter.version>0.3.0</future-converter.version>
+    <appengine-api.version>1.9.54</appengine-api.version>
+    <future-converter.version>1.1.0</future-converter.version>
+
+    <junit.version>4.12</junit.version>
+    <assertj-core.version>3.8.0</assertj-core.version>
+    <mockito-all.version>2.0.2-beta</mockito-all.version>
   </properties>
 
   <licenses>
@@ -268,19 +271,19 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.12</version>
+        <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
-        <version>3.4.1</version>
+        <version>${assertj-core.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-all</artifactId>
-        <version>2.0.2-beta</version>
+        <version>${mockito-all.version}</version>
         <scope>test</scope>
       </dependency>
     </dependencies>