Merge pull request #192 from palantir/fix-gradle-repositories

Fix gradle repositories
palantir · Apr 24, 2017 · 7180b45 · 7180b45
2 parents 6cf65ca + 687a150
commit 7180b45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 buildscript {
     repositories {
         mavenCentral()
-        jcenter()
         maven {
             url "https://dl.bintray.com/palantir/releases"
         }
         maven {
             url 'https://plugins.gradle.org/m2/'
         }
+        jcenter()
     }
     dependencies {
         classpath 'com.palantir:gradle-baseline-java:0.9.0'

diff --git a/...compose-rule-core/src/main/java/com/palantir/docker/compose/logging/FileLogCollector.java b/...compose-rule-core/src/main/java/com/palantir/docker/compose/logging/FileLogCollector.java
@@ -86,6 +86,7 @@ public synchronized void stopCollecting() throws InterruptedException {
             log.warn("docker containers were still running when log collection stopped");
             executor.shutdownNow();
         }
+        executor = null;
     }
 
 }