Fixes #250 'Throwables other than Exceptions are not propagated to the main thread '

docker-compose-rule-core/core.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    compile 'com.jayway.awaitility:awaitility:1.6.5'
+    compile 'org.awaitility:awaitility:3.1.2'
     compile "com.github.zafarkhaja:java-semver:$javaSemverVersion"
     compile "com.google.guava:guava:$guavaVersion"
     compile "commons-io:commons-io:2.4"

docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/ClusterWait.java

@@ -15,13 +15,13 @@
  */
 package com.palantir.docker.compose.connection.waiting;
 
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.core.ConditionTimeoutException;
 import com.palantir.docker.compose.connection.Cluster;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionTimeoutException;
 import org.joda.time.ReadableDuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DefaultDockerCompose.java

@@ -22,7 +22,6 @@
 import com.github.zafarkhaja.semver.Version;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
-import com.jayway.awaitility.Awaitility;
 import com.palantir.docker.compose.configuration.DockerComposeFiles;
 import com.palantir.docker.compose.configuration.ProjectName;
 import com.palantir.docker.compose.connection.Container;
@@ -37,6 +36,7 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.IOUtils;
+import org.awaitility.Awaitility;
 import org.joda.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerIntegrationTests.java

@@ -4,15 +4,14 @@
 
 package com.palantir.docker.compose.connection;
 
-import static com.jayway.awaitility.Awaitility.await;
 import static com.palantir.docker.compose.execution.DockerComposeExecArgument.arguments;
 import static com.palantir.docker.compose.execution.DockerComposeExecOption.noOptions;
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeThat;
 
 import com.github.zafarkhaja.semver.Version;
-import com.jayway.awaitility.core.ConditionFactory;
 import com.palantir.docker.compose.configuration.DockerComposeFiles;
 import com.palantir.docker.compose.configuration.ProjectName;
 import com.palantir.docker.compose.execution.DefaultDockerCompose;
@@ -21,6 +20,7 @@
 import com.palantir.docker.compose.execution.DockerExecutable;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
+import org.awaitility.core.ConditionFactory;
 import org.junit.Test;
 import org.mockito.internal.matchers.GreaterOrEqual;
 

docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/ClusterWaitShould.java

@@ -72,4 +72,32 @@ public class ClusterWaitShould {
 
         wait.waitUntilReady(cluster);
     }
+
+    @SuppressWarnings("unchecked")
+    @Test public void
+    should_propagate_throwable() throws InterruptedException {
+        class AThrowable extends Throwable {}
+
+        when(clusterHealthCheck.isClusterHealthy(cluster))
+                .thenThrow(AThrowable.class);
+
+        exception.expect(AThrowable.class);
+
+        ClusterWait wait = new ClusterWait(clusterHealthCheck, DURATION);
+        wait.waitUntilReady(cluster);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test public void
+    should_propagate_error() throws InterruptedException {
+        class AnError extends Error {}
+
+        when(clusterHealthCheck.isClusterHealthy(cluster))
+                .thenThrow(AnError.class);
+
+        exception.expect(AnError.class);
+
+        ClusterWait wait = new ClusterWait(clusterHealthCheck, DURATION);
+        wait.waitUntilReady(cluster);
+    }
 }

docker-compose-rule-junit4/junit4.gradle

@@ -6,7 +6,7 @@ dependencies {
     compile project(':docker-compose-rule-core')
 
     testCompile 'com.github.zafarkhaja:java-semver:0.9.0'
-    testCompile 'com.jayway.awaitility:awaitility:1.6.5'
+    testCompile 'org.awaitility:awaitility:3.1.2'
     testCompile 'commons-io:commons-io:2.4'
     testCompile "com.google.guava:guava:$guavaVersion"
     testCompile "joda-time:joda-time:$jodaVersion"

docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleNativeHealthcheckIntegrationTest.java

@@ -5,9 +5,9 @@
 package com.palantir.docker.compose;
 
 import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly;
-import static com.jayway.awaitility.Awaitility.await;
 import static com.palantir.docker.compose.execution.DockerComposeExecArgument.arguments;
 import static com.palantir.docker.compose.execution.DockerComposeExecOption.noOptions;
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeThat;