Upgrade docker-compose-rule to 0.33.0 (#9)

* Upgrade docker-compose-rule to 0.33.0 * Use updated artifact name * Remove uses of deprecated shutdown strategies
palantir · May 16, 2018 · e8c0486 · e8c0486
1 parent bf30ca7
commit e8c0486
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -63,7 +63,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compile group: 'com.palantir.docker.compose', name: 'docker-compose-rule'
+    compile group: 'com.palantir.docker.compose', name: 'docker-compose-rule-junit4'
     compile group: 'junit', name: 'junit'
     compile group: 'net.amygdalum', name: 'xrayinterface'
     compile group: 'one.util', name: 'streamex'

diff --git a/src/main/java/com/palantir/docker/proxy/DockerProxyRule.java b/src/main/java/com/palantir/docker/proxy/DockerProxyRule.java
@@ -9,7 +9,6 @@
 import com.google.common.io.Resources;
 import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.configuration.ProjectName;
-import com.palantir.docker.compose.configuration.ShutdownStrategy;
 import com.palantir.docker.compose.connection.Container;
 import com.palantir.docker.compose.connection.DockerMachine;
 import com.palantir.docker.compose.execution.DockerExecutable;
@@ -49,7 +48,6 @@ public DockerProxyRule(
                 .file(getDockerComposeFile(this.dockerContainerInfo.getNetworkName()).getPath())
                 .waitingForService("proxy", Container::areAllPortsOpen)
                 .saveLogsTo(LogDirectory.circleAwareLogDirectory(logDirectory))
-                .shutdownStrategy(ShutdownStrategy.AGGRESSIVE_WITH_NETWORK_CLEANUP)
                 .retryAttempts(0)
                 .build();
     }

diff --git a/src/test/java/com/palantir/docker/proxy/DockerProxyRuleTest.java b/src/test/java/com/palantir/docker/proxy/DockerProxyRuleTest.java
@@ -4,7 +4,6 @@
 package com.palantir.docker.proxy;
 
 import com.palantir.docker.compose.DockerComposeRule;
-import com.palantir.docker.compose.configuration.ShutdownStrategy;
 import com.palantir.docker.compose.connection.Container;
 import com.palantir.docker.compose.logging.LogDirectory;
 import java.io.IOException;
@@ -19,7 +18,6 @@ public class DockerProxyRuleTest {
             .file("src/test/resources/DockerProxyRuleTest-services.yml")
             .saveLogsTo(LogDirectory.circleAwareLogDirectory(DockerProxyRuleTest.class))
             .waitingForService("webserver", Container::areAllPortsOpen)
-            .shutdownStrategy(ShutdownStrategy.AGGRESSIVE_WITH_NETWORK_CLEANUP)
             .build();
 
     @Test

diff --git a/versions.props b/versions.props
@@ -1,4 +1,4 @@
-com.palantir.docker.compose:docker-compose-rule = 0.28.1
+com.palantir.docker.compose:docker-compose-rule-junit4 = 0.33.0
 junit:junit = 4.12
 net.amygdalum:xrayinterface = 0.3.0
 one.util:streamex = 0.6.3