From a2adeae9ac12b7fc4c9f7a8d1bacaa7db97a430a Mon Sep 17 00:00:00 2001
From: iamdanfox <iamdanfox@gmail.com>
Date: Mon, 21 Jan 2019 13:31:46 +0000
Subject: [PATCH] Use modern gradle tooling (#259)

---
 .../checkstyle/checkstyle-suppressions.xml    |  14 +-
 .baseline/checkstyle/checkstyle.xml           | 151 ++++++++++++++----
 .../{apache-2.0.txt => 001_apache-2.0.txt}    |   2 +-
 .../copyright/palantir-copyright-external.txt |  13 --
 .../copyright/palantir-copyright-internal.txt |   0
 .baseline/eclipse/org.eclipse.jdt.core.prefs  |  12 +-
 .../dotfile.settings/org.eclipse.jdt.ui.prefs |   2 +-
 .../idea/intellij-java-palantir-style.xml     |  26 ++-
 .bulldozer.yml                                |  14 ++
 .policy.yml                                   |  50 ++++++
 README.md                                     |   2 +-
 build.gradle                                  |  23 ++-
 .../{core.gradle => build.gradle}             |   0
 .../docker/compose/CustomImmutablesStyle.java |   2 +-
 .../AdditionalEnvironmentValidator.java       |   2 +-
 .../DaemonEnvironmentValidator.java           |   6 +-
 .../configuration/DaemonHostIpResolver.java   |   2 +-
 .../configuration/DockerComposeFiles.java     |   2 +-
 .../compose/configuration/DockerType.java     |   2 +-
 .../configuration/EnvironmentValidator.java   |   2 +-
 .../configuration/EnvironmentVariables.java   |   2 +-
 .../compose/configuration/HostIpResolver.java |   2 +-
 .../compose/configuration/PackageVisible.java |   2 +-
 .../compose/configuration/ProjectName.java    |   6 +-
 .../RemoteEnvironmentValidator.java           |   2 +-
 .../configuration/RemoteHostIpResolver.java   |   2 +-
 .../configuration/ShutdownStrategy.java       |   2 +-
 .../docker/compose/connection/Cluster.java    |   2 +-
 .../docker/compose/connection/Container.java  |   9 +-
 .../compose/connection/ContainerCache.java    |   2 +-
 .../compose/connection/ContainerName.java     |   2 +-
 .../compose/connection/ContainerNames.java    |   2 +-
 .../compose/connection/DockerMachine.java     |   2 +-
 .../docker/compose/connection/DockerPort.java |   2 +-
 .../compose/connection/PortMapping.java       |   2 +-
 .../docker/compose/connection/Ports.java      |   2 +-
 .../docker/compose/connection/State.java      |   2 +-
 .../compose/connection/waiting/Attempt.java   |   2 +-
 .../waiting/ClusterHealthCheck.java           |   2 +-
 .../connection/waiting/ClusterWait.java       |   2 +-
 .../connection/waiting/Exceptions.java        |   2 +-
 .../connection/waiting/HealthCheck.java       |   2 +-
 .../connection/waiting/HealthChecks.java      |   2 +-
 .../connection/waiting/SuccessOrFailure.java  |   2 +-
 .../execution/AggressiveShutdownStrategy.java |   2 +-
 ...iveShutdownWithNetworkCleanupStrategy.java |   2 +-
 .../docker/compose/execution/Command.java     |   2 +-
 ...lictingContainerRemovingDockerCompose.java |   2 +-
 .../execution/DefaultDockerCompose.java       |  10 +-
 .../execution/DelegatingDockerCompose.java    |   2 +-
 .../docker/compose/execution/Docker.java      |   3 +-
 .../execution/DockerCommandLocations.java     |   2 +-
 .../compose/execution/DockerCompose.java      |   2 +-
 .../execution/DockerComposeExecArgument.java  |   2 +-
 .../execution/DockerComposeExecOption.java    |   2 +-
 .../execution/DockerComposeExecutable.java    |   2 +-
 .../execution/DockerComposeRunArgument.java   |   2 +-
 .../execution/DockerComposeRunOption.java     |   2 +-
 .../execution/DockerComposeVersion.java       |   2 +-
 .../execution/DockerConfiguration.java        |   2 +-
 .../compose/execution/DockerExecutable.java   |   2 +-
 .../execution/DockerExecutionException.java   |   2 +-
 .../execution/DockerForMacHostsIssue.java     |   3 +-
 .../compose/execution/ErrorHandler.java       |   2 +-
 .../docker/compose/execution/Executable.java  |   2 +-
 .../execution/GracefulShutdownStrategy.java   |   2 +-
 .../execution/KillDownShutdownStrategy.java   |   2 +-
 .../compose/execution/ProcessResult.java      |   2 +-
 .../docker/compose/execution/Retryer.java     |   2 +-
 .../execution/RetryingDockerCompose.java      |   2 +-
 .../execution/SkipShutdownStrategy.java       |   2 +-
 .../logging/DoNothingLogCollector.java        |   2 +-
 .../compose/logging/FileLogCollector.java     |   2 +-
 .../docker/compose/logging/LogCollector.java  |   2 +-
 .../docker/compose/logging/LogDirectory.java  |   2 +-
 .../matchers/AvailablePortMatcher.java        |   2 +-
 .../AggressiveShutdownStrategyTest.java       |   2 +-
 ...hutdownWithNetworkCleanupStrategyTest.java |   2 +-
 .../docker/compose/TestContainerNames.java    |   2 +-
 .../AdditionalEnvironmentValidatorShould.java |   2 +-
 .../DaemonEnvironmentValidatorShould.java     |   2 +-
 .../DaemonHostIpResolverShould.java           |   2 +-
 .../DockerComposeFilesShould.java             |   2 +-
 .../configuration/DockerTypeShould.java       |   2 +-
 .../configuration/MockDockerEnvironment.java  |   2 +-
 .../configuration/ProjectNameShould.java      |   2 +-
 .../RemoteEnvironmentValidatorShould.java     |   2 +-
 .../RemoteHostIpResolverShould.java           |   2 +-
 .../connection/ContainerCacheShould.java      |   2 +-
 .../connection/ContainerIntegrationTests.java |   2 +-
 .../connection/ContainerNameShould.java       |   2 +-
 .../compose/connection/ContainerShould.java   |   2 +-
 .../DockerPortFormattingShould.java           |   2 +-
 .../connection/LocalBuilderShould.java        |   2 +-
 .../compose/connection/PortsShould.java       |   2 +-
 .../connection/RemoteBuilderShould.java       |   2 +-
 .../connection/waiting/ClusterWaitShould.java |   2 +-
 .../connection/waiting/ExceptionsShould.java  |   2 +-
 .../waiting/HttpHealthCheckShould.java        |   2 +-
 .../waiting/PortsHealthCheckShould.java       |   2 +-
 .../waiting/SuccessOrFailureMatchers.java     |   2 +-
 .../waiting/SuccessOrFailureShould.java       |   2 +-
 .../compose/execution/CommandShould.java      |   4 +-
 ...gContainerRemovingDockerComposeShould.java |   3 +-
 .../DockerCommandLocationsShould.java         |   4 +-
 .../DockerComposeExecOptionShould.java        |   2 +-
 .../execution/DockerComposeShould.java        |   4 +-
 .../execution/DockerComposeVersionShould.java |   2 +-
 .../compose/execution/DockerShould.java       |   4 +-
 .../GracefulShutdownStrategyShould.java       |   2 +-
 .../KillDownShutdownStrategyShould.java       |   2 +-
 .../compose/execution/RetryerShould.java      |   2 +-
 .../RetryingDockerComposeShould.java          |   2 +-
 .../logging/FileLogCollectorShould.java       |  14 +-
 .../compose/logging/LogDirectoryTest.java     |   2 +-
 .../matchers/AvailablePortMatcherShould.java  |   2 +-
 .../DockerMachineEnvironmentMatcher.java      |   2 +-
 .../docker/compose/matchers/IOMatchers.java   |   2 +-
 .../compose/matchers/ValueCachingMatcher.java |   2 +-
 .../compose/utils/MockitoMultiAnswer.java     |   2 +-
 .../{junit4.gradle => build.gradle}           |   0
 .../docker/compose/DockerComposeRule.java     |   3 +-
 ...essiveShutdownStrategyIntegrationTest.java |   2 +-
 ...NetworkCleanupStrategyIntegrationTest.java |   2 +-
 .../DockerComposeRuleIntegrationTest.java     |   2 +-
 ...eRuleNativeHealthcheckIntegrationTest.java |   2 +-
 .../compose/DockerComposeRuleShould.java      |  10 +-
 ...ComposeRuleUpContainerIntegrationTest.java |   2 +-
 .../HostNetworkedPortsIntegrationTest.java    |   3 +-
 ...eConflictingContainersIntegrationTest.java |   2 +-
 .../EnvironmentVariableIntegrationTest.java   |   2 +-
 .../logging/LoggingIntegrationTest.java       |   4 +-
 gradle/publish-jar.gradle                     |  30 ++++
 gradle/publish.gradle                         |  75 ---------
 settings.gradle                               |   9 +-
 135 files changed, 410 insertions(+), 307 deletions(-)
 rename .baseline/copyright/{apache-2.0.txt => 001_apache-2.0.txt} (87%)
 delete mode 100644 .baseline/copyright/palantir-copyright-external.txt
 delete mode 100644 .baseline/copyright/palantir-copyright-internal.txt
 create mode 100644 .bulldozer.yml
 create mode 100644 .policy.yml
 rename docker-compose-rule-core/{core.gradle => build.gradle} (100%)
 rename docker-compose-rule-junit4/{junit4.gradle => build.gradle} (100%)
 create mode 100644 gradle/publish-jar.gradle
 delete mode 100644 gradle/publish.gradle

diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
index 44de1a46a..2a7cd17ed 100644
--- a/.baseline/checkstyle/checkstyle-suppressions.xml
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -10,6 +10,13 @@
     <!-- Suppress test classes -->
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="Javadoc*" />
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VariableDeclarationUsageDistance" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VisibilityModifier" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="AvoidStaticImport" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemOut" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemErr" />
+
+    <!-- Suppress test resources -->
+    <suppress files="[/\\]src[/\\]test[/\\]resources.*" checks="." />
 
     <!-- JavadocStyle enforces existence of package-info.java package-level Javadoc; we consider this a bug. -->
     <suppress files="package-info.java" checks="JavadocStyle" />
@@ -19,13 +26,14 @@
     <suppress files="\.(bdr|eot|gif|gzip|jar|json|otf|png|svg|ttf|woff|zip)$" checks="NewlineAtEndOfFile" />
 
     <!-- Generated code should not be subjected to checkstyle. -->
-    <suppress files="[/\\].*[/\\]generated_src[/\\]" checks="." />
-    <suppress files="[/\\].*[/\\]generated_testSrc[/\\]" checks="." />
+    <suppress files="[/\\].*[/\\]generated.*[/\\]" checks="." />
 
     <!-- Docker Compose Rule modifications: -->
     <suppress files=".*" checks="DesignForExtension" />
     <suppress files=".*" checks="LineLength" />
     <suppress files=".*" checks="AbbreviationAsWordInName" />
     <suppress files=".*" checks="TypeName" />
-    <!-- Also deleted AvoidStaticImport, OverloadMethodsDeclarationOrder and some regexes -->
+    <suppress files=".*" checks="AvoidStaticImport" />
+    <suppress files=".*" checks="OverloadMethodsDeclarationOrder" />
+    <suppress files=".*" checks="FinalClass" />
 </suppressions>
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index d513cb33f..c42ade258 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -14,15 +14,12 @@
     <property name="charset" value="UTF-8"/>
     <property name="severity" value="error"/>
 
-    <module name="FileLength"> <!-- Java Style Guide: File length: 2000 lines -->
-        <property name="fileExtensions" value="java"/>
-    </module>
     <module name="FileTabCharacter"/> <!-- Java Style Guide: Whitespace characters -->
     <module name="NewlineAtEndOfFile"> <!-- Java Style Guide: Line ending: LF -->
         <property name="lineSeparator" value="lf"/>
     </module>
     <module name="RegexpHeader">
-        <property name="header" value="^/\*$\n^ \* Copyright \d{4} Palantir Technologies, Inc\. All rights reserved\.$"/>
+        <property name="header" value="^/\*$\n^ \* \(c\) Copyright \d{4} Palantir Technologies Inc\. All rights reserved\.$"/>
         <property name="fileExtensions" value=".java,.ts"/>
     </module>
     <module name="RegexpMultiline"> <!-- Development Practices: Writing good unit tests -->
@@ -42,12 +39,22 @@
         <property name="format" value="\s+$"/>
         <property name="message" value="Whitespace at end-of-line"/>
     </module>
+    <module name="RegexpMultiline"> <!-- Java Style Guide: Vertical Whitespace -->
+        <property name="fileExtensions" value="java"/>
+        <property name="format" value="^\n\n$"/>
+        <property name="message" value="Two consecutive blank lines are not permitted."/>
+    </module>
     <module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
         <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
     </module>
     <module name="SuppressWarningsFilter"/> <!-- baseline-gradle: README.md -->
-    <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
     <module name="TreeWalker">
+        <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+            <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+            <property name="checkFormat" value="$1"/>
+        </module>
         <module name="AbbreviationAsWordInName"> <!-- Java Style Guide: Camel case : defined -->
             <property name="ignoreFinal" value="false"/>
             <property name="allowedAbbreviationLength" value="1"/>
@@ -70,6 +77,14 @@
             <property name="allowInSwitchCase" value="true"/>
         </module>
         <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
+        <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
+            <property name="excludes" value="
+                java.util.Collections.*,
+                java.util.stream.Collectors.*,
+                com.palantir.logsafe.Preconditions.*,
+                com.google.common.base.Preconditions.*,
+                org.apache.commons.lang3.Validate.*"/>
+        </module>
         <module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
             <message key="name.invalidPattern" value="Class type name ''{0}'' must match pattern ''{1}''."/>
@@ -90,7 +105,7 @@
         <module name="EmptyStatement"/> <!-- Java Style Guide: One statement per line -->
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/> <!-- Java Style Guide: Fall-through: commented -->
-        <module name="FileContentsHolder"/> <!-- Required for SuppressionCommentFilter -->
+        <module name="FinalClass"/> <!-- Java Coding Guidelines: Private constructors -->
         <module name="GenericWhitespace"> <!-- Java Style Guide: Horizontal whitespace -->
             <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
             <message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
@@ -103,14 +118,45 @@
             <property name="setterCanReturnItsClass" value="true"/>
         </module>
         <module name="HideUtilityClassConstructor"/> <!-- Java Coding Guidelines: Private constructors -->
+        <module name="IllegalImport"> <!-- Java Coding Guidelines: Use JUnit 4-style test classes and assertions -->
+            <property name="illegalPkgs" value="junit.framework"/>
+            <message key="import.illegal" value="Use JUnit 4-style (org.junit.*) test classes and assertions instead of JUnit 3 (junit.framework.*)."/>
+        </module>
         <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
-            <property name="illegalPkgs" value="sun, org.elasticsearch.common.base, org.elasticsearch.common.joda, jersey.repackaged.com.google.common, com.google.api.client.repackaged, org.apache.hadoop.thirdparty.guava"/>
+            <property name="illegalPkgs" value="org.elasticsearch.common.base, com.clearspring.analytics.util, org.spark_project.guava"/>
+            <message key="import.illegal" value="Must not import repackaged classes."/>
+        </module>
+        <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
+            <property name="illegalPkgs" value=".*\.(repackaged|shaded|thirdparty)"/>
+            <property name="regexp" value="true" />
             <message key="import.illegal" value="Must not import repackaged classes."/>
         </module>
         <module name="IllegalImport">
+            <property name="illegalPkgs" value="^org\.gradle\.(internal|.*\.internal)"/>
+            <property name="regexp" value="true" />
+            <message key="import.illegal" value="Do not rely on gradle internal classes as these may change in minor releases - use org.gradle.api versions instead."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="sun"/>
+            <message key="import.illegal" value="Must not use Oracle's Java implementation details. See http://www.oracle.com/technetwork/java/faq-sun-packages-142232.html ."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="org.apache.commons.lang"/>
+            <message key="import.illegal" value="lang is deprecated, use lang3 instead."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="org.apache.commons.math"/>
+            <message key="import.illegal" value="math is deprecated, use math3 instead."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="id" value="BanLoggingImplementations"/>
             <property name="illegalPkgs" value="org.apache.log4j, org.apache.logging.log4j, java.util.logging, ch.qos.logback"/>
             <message key="import.illegal" value="Use SLF4J instead of a logging framework directly."/>
         </module>
+        <module name="IllegalImport">
+            <property name="illegalClasses" value="com.google.common.base.Optional, com.google.common.base.Supplier"/>
+            <message key="import.illegal" value="Use the Java8 version of Guava objects."/>
+        </module>
         <module name="IllegalInstantiation"> <!-- Java Coding Guidelines: Never instantiate primitive types -->
             <property name="classes" value="java.lang.Boolean"/>
             <property name="classes" value="java.lang.Byte"/>
@@ -127,11 +173,17 @@
             <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
         </module>
         <module name="IllegalType"> <!-- Java Coding Guide: Limit coupling on concrete classes -->
-            <property name="illegalClassNames" value="java.util.HashSet, java.util.HashMap, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
+            <property name="illegalClassNames" value="java.util.ArrayList, java.util.HashSet, java.util.HashMap, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
+        </module>
+        <module name="IllegalType">
+            <property name="id" value="BanGuavaCaches"/>
+            <property name="illegalClassNames" value="com.google.common.cache.CacheBuilder, com.google.common.cache.Cache, com.google.common.cache.LoadingCache"/>
+            <message key="illegal.type" value="Do not use Guava caches, they are outperformed by and harder to use than Caffeine caches"/>
         </module>
         <module name="ImportOrder"> <!-- Java Style Guide: Ordering and spacing -->
             <property name="groups" value="/.*/"/>
             <property name="option" value="top"/>
+            <property name="separated" value="true"/>
             <property name="sortStaticImportsAlphabetically" value="true"/>
         </module>
         <module name="Indentation"> <!-- Java Style Guide: Block indentation: +4 spaces -->
@@ -139,20 +191,21 @@
             <property name="lineWrappingIndentation" value="8"/>
         </module>
         <module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used -->
-        <module name="LeftCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
-            <property name="maxLineLength" value="150"/>
-        </module>
+        <module name="LeftCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style -->
         <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
-            <property name="max" value="150"/>
+            <property name="max" value="120"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
         <module name="MemberName"> <!-- Java Style Guide: Non-constant field names -->
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/>
         </module>
+        <module name="MethodName"> <!-- Java Style Guide: Method names -->
+            <property name="format" value="^[a-z][a-zA-Z0-9_]+$"/>
+            <message key="name.invalidPattern" value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
         <module name="MethodParamPad"/> <!-- Java Style Guide: Horizontal whitespace -->
         <module name="MissingDeprecated"/> <!-- Java Coding Guide: Deprecate per annotation and Javadoc -->
-        <module name="MissingSwitchDefault"/> <!-- Java Style Guide: The default case is present -->
         <module name="ModifiedControlVariable"/> <!-- Java Coding Guide: For-loop control variables: never modified -->
         <module name="ModifierOrder"/> <!-- Java Style Guide: Modifiers -->
         <module name="MultipleVariableDeclarations"/> <!-- Java Style Guide: One variable per declaration -->
@@ -175,6 +228,7 @@
             <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
         </module>
         <module name="OuterTypeFilename"/> <!-- Java Style Guide: File name -->
+        <module name="OverloadMethodsDeclarationOrder"/> <!-- Java Style Guide: Overloads: never split -->
         <module name="PackageAnnotation"/> <!-- Java Style Guide: Package statement -->
         <module name="PackageDeclaration"/> <!-- Java Style Guide: Package statement -->
         <module name="PackageName"> <!-- Java Style Guide: Package names -->
@@ -225,10 +279,27 @@
             <property name="format" value="CoreMatchers\.equalTo"/>
             <property name="message" value="Use Assert.assertEquals()."/>
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanJacksonFindAndRegisterModulesMethod"/>
+            <property name="format" value="findAndRegisterModules"/>
+            <property name="message" value="Use ObjectMapper#registerModule(&lt;yourModule&gt;) explicitly. ObjectMapper#findAndRegisterModules() is dangerous because it will change behaviour depending on which modules are on your classpath (including transitive dependencies)."/>
+        </module>
         <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
             <property name="format" value="CoreMatchers\.notNull"/>
             <property name="message" value="Use better assertion method(s): Assert.assertEquals(), assertNull(), assertSame(), etc."/>
         </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Avoid Generics clutter where possible -->
+            <property name="format" value="ImmutableList\.Builder.*new ImmutableList\.Builder"/>
+            <property name="message" value="Use ImmutableList.builder() for variable assignment."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Avoid Generics clutter where possible -->
+            <property name="format" value="ImmutableMap\.Builder.*new ImmutableMap\.Builder"/>
+            <property name="message" value="Use ImmutableMap.builder() for variable assignment."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Avoid Generics clutter where possible -->
+            <property name="format" value="ImmutableSet\.Builder.*new ImmutableSet\.Builder"/>
+            <property name="message" value="Use ImmutableSet.builder() for variable assignment."/>
+        </module>
         <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Check parameters for validity -->
             <property name="format" value="Preconditions\.checkNotNull\((?!.*,)([^()]*(\(([^()]*|\(([^()]*|\([^()]*\))*\))*\)[^()]*)*)\)"/>
             <property name="message" value="Use Preconditions.checkNotNull(Object, String)."/>
@@ -253,19 +324,6 @@
             <property name="format" value="\? extends Object\W"/>
             <property name="message" value="Use ? rather than ? extends Object."/>
         </module>
-        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Libraries -->
-            <property name="format" value="^import org\.apache\.commons\.lang\."/>
-            <property name="message" value="lang is deprecated, use lang3 instead."/>
-        </module>
-        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Libraries -->
-            <property name="format" value="^import org\.apache\.commons\.math\."/>
-            <property name="message" value="math is deprecated, use math3 instead."/>
-        </module>
-        <module name="RegexpSinglelineJava">
-            <property name="format" value="\bPreconditions\.check.*\{\}"/>
-            <property name="message" value="Use printf-style formatting in Preconditions, not '{}' style formatting."/>
-            <property name="ignoreComments" value="true"/>
-        </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="(?i)log(ger)?\.(debug|info|warn|error)\(.*%[sd]"/>
             <property name="message" value="SLF4J loggers support '{}' style formatting."/>
@@ -277,7 +335,19 @@
             <property name="ignoreComments" value="true"/>
         </module>
         <module name="RegexpSinglelineJava">
-            <property name="format" value="\bCharset.forName\(|\bCharsets\."/>
+            <property name="id" value="BanSystemOut"/>
+            <property name="format" value="System\.out\."/>
+            <property name="message" value="Logging with System.out is not allowed because it has no metadata and can't be configured at runtime. Please use an SLF4J logger instead, e.g. log.info(&quot;Message&quot;)."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanSystemErr"/>
+            <property name="format" value="System\.err\."/>
+            <property name="message" value="Logging with System.err is not allowed because it has no metadata and can't be configured at runtime. Please use an SLF4J logger instead, e.g. log.info(&quot;Message&quot;)."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="\bCharsets\."/>
             <property name="message" value="Use JDK StandardCharsets instead of alternatives."/>
         </module>
         <module name="RegexpSinglelineJava">
@@ -286,16 +356,27 @@
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\bIOUtils\.toString\("/>
-            <property name="message" value="Prefer Guava''s {CharStreams,Files,Resources}.toString to avoid charset/stream closing issues."/>
+            <property name="message" value="Prefer Guava''s [CharStreams,Files,Resources].toString to avoid charset/stream closing issues."/>
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="static enum"/>
             <property name="message" value="Redundant ''static'' modifier."/>
         </module>
-        <module name="RightCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style -->
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
+            <property name="message" value="TODO format: // TODO(#issue): explanation"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="(void setUp\(\))|(void setup\(\))|(void setupStatic\(\))|(void setUpStatic\(\))|(void beforeTest\(\))|(void teardown\(\))|(void tearDown\(\))|(void beforeStatic\(\))|(void afterStatic\(\))"/>
+            <property name="message" value="Test setup/teardown methods are called before(), beforeClass(), after(), afterClass(), but not setUp, teardown, etc."/>
+        </module>
+        <module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
+            <property name="option" value="same"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
+        </module>
         <module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
             <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
         </module>
         <module name="SeparatorWrap"> <!-- Java Style Guide: Where to break -->
             <property name="tokens" value="DOT"/>
@@ -342,7 +423,9 @@
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
         <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
-        <module name="DesignForExtension"/> <!-- Java Coding Guidelines: Design for extension -->
+        <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
+            <property name="ignoredAnnotations" value="Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+        </module>
         <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
             <property name="scope" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
@@ -359,7 +442,7 @@
         <module name="LocalFinalVariableName"/> <!-- Java Style Guide: Local variable names -->
         <module name="LocalVariableName"> <!-- Java Style Guide: Local variable names -->
             <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
             <property name="allowOneCharVarInForLoop" value="true"/>
             <message key="name.invalidPattern" value="Local variable name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -374,7 +457,7 @@
         <module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
         <module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
         <module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
diff --git a/.baseline/copyright/apache-2.0.txt b/.baseline/copyright/001_apache-2.0.txt
similarity index 87%
rename from .baseline/copyright/apache-2.0.txt
rename to .baseline/copyright/001_apache-2.0.txt
index c12d5ab06..54d4a0312 100644
--- a/.baseline/copyright/apache-2.0.txt
+++ b/.baseline/copyright/001_apache-2.0.txt
@@ -1,4 +1,4 @@
-Copyright ${today.year} Palantir Technologies, Inc. All rights reserved.
+(c) Copyright ${today.year} Palantir Technologies Inc. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/.baseline/copyright/palantir-copyright-external.txt b/.baseline/copyright/palantir-copyright-external.txt
deleted file mode 100644
index 79ba63068..000000000
--- a/.baseline/copyright/palantir-copyright-external.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright ${today.year} Palantir Technologies, Inc. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
diff --git a/.baseline/copyright/palantir-copyright-internal.txt b/.baseline/copyright/palantir-copyright-internal.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/.baseline/eclipse/org.eclipse.jdt.core.prefs b/.baseline/eclipse/org.eclipse.jdt.core.prefs
index 1a4c6b3ab..fc7a7ddf5 100644
--- a/.baseline/eclipse/org.eclipse.jdt.core.prefs
+++ b/.baseline/eclipse/org.eclipse.jdt.core.prefs
@@ -15,9 +15,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.CheckForNull
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=${javaTargetVersion}
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=${javaTargetVersion}
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -26,7 +26,7 @@ org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=${javaSourceVersion}
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
@@ -87,7 +87,7 @@ org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
+org.eclipse.jdt.core.formatter.comment.line_length=120
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
@@ -109,7 +109,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
 org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
@@ -298,7 +298,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
+org.eclipse.jdt.core.formatter.lineSplit=120
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
index d3db44ab7..f2990d969 100644
--- a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
+++ b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
@@ -11,7 +11,7 @@ org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.overrideannotation=true
 org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * Copyright 2016 Palantir Technologies, Inc. All rights reserved.\n */\n\n${package_declaration}\n\n/**\n * \n */\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * (c) Copyright ${year} Palantir Technologies Inc. All rights reserved.\n */\n\n${package_declaration}\n\n/**\n * \n */\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
index 185505826..9aa48633a 100644
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -50,11 +50,13 @@
         <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
         <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
         <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+        <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
         <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
         <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
         <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
         <option name="METHOD_PARAMETERS_WRAP" value="1" />
         <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
         <option name="OTHER_INDENT_OPTIONS">
           <value>
             <option name="INDENT_SIZE" value="4" />
@@ -66,7 +68,7 @@
             <option name="LABEL_INDENT_ABSOLUTE" value="false" />
             <option name="USE_RELATIVE_INDENTS" value="false" />
           </value>
-         </option>
+        </option>
         <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
           <value />
         </option>
@@ -84,30 +86,44 @@
           <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
           <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
           <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
           <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
           <option name="BINARY_OPERATION_WRAP" value="1" />
           <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="5" />
           <option name="DOWHILE_BRACE_FORCE" value="3" />
+          <option name="ENUM_CONSTANTS_WRAP" value="2" />
           <option name="EXTENDS_KEYWORD_WRAP" value="1" />
           <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="FIELD_ANNOTATION_WRAP" value="1" />
           <option name="FOR_BRACE_FORCE" value="3" />
           <option name="FOR_STATEMENT_WRAP" value="1" />
           <option name="IF_BRACE_FORCE" value="3" />
-          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+          <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+          <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
           <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
           <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
           <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+          <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
           <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
-          <option name="METHOD_PARAMETERS_WRAP" value="1" />
+          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+          <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+          <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+          <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
           <option name="PARENT_SETTINGS_INSTALLED" value="true" />
           <option name="RESOURCE_LIST_WRAP" value="5" />
+          <option name="RIGHT_MARGIN" value="120" />
           <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
           <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="TERNARY_OPERATION_WRAP" value="1" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
           <option name="THROWS_KEYWORD_WRAP" value="1" />
           <option name="THROWS_LIST_WRAP" value="1" />
           <option name="WHILE_BRACE_FORCE" value="3" />
+          <option name="WRAP_ON_TYPING" value="1" />
           <arrangement>
             <rules>
               <section>
diff --git a/.bulldozer.yml b/.bulldozer.yml
new file mode 100644
index 000000000..a3a528519
--- /dev/null
+++ b/.bulldozer.yml
@@ -0,0 +1,14 @@
+version: 1
+merge:
+  whitelist:
+    labels: ["merge when ready"]
+  blacklist:
+    labels: ["do not merge"]
+  method: squash
+  options:
+    squash:
+      body: pull_request_body
+  delete_after_merge: true
+update:
+  whitelist:
+    labels: ["update me"]
diff --git a/.policy.yml b/.policy.yml
new file mode 100644
index 000000000..e51185711
--- /dev/null
+++ b/.policy.yml
@@ -0,0 +1,50 @@
+policy:
+  approval:
+    - or:
+      - docker-compose-rule team approval
+      - docker-compose-rule team co-approval
+      - infrastructure team approval
+      - infrastructure team co-approval
+      - excavator only touched baseline, gradle files or versions.props
+  disapproval:
+    requires:
+      organizations: [ "palantir" ]
+
+approval_rules:
+  - name: docker-compose-rule team approval
+    requires:
+      count: 1
+      teams: [ "palantir/docker-compose-rule" ]
+
+  - name: docker-compose-rule team co-approval
+    options: { allow_contributor: true }
+    requires:
+      count: 2
+      teams: [ "palantir/docker-compose-rule" ]
+
+  - name: infrastructure team approval
+    requires:
+      count: 1
+      teams: [ "palantir/infrastructure" ]
+
+  - name: infrastructure team co-approval
+    options: { allow_contributor: true }
+    requires:
+      count: 2
+      teams: [ "palantir/infrastructure" ]
+
+  - name: excavator only touched baseline, gradle files or versions.props
+    requires:
+      count: 0
+    if:
+      has_author_in:
+        users: [ "svc-excavator-bot" ]
+      only_changed_files:
+        paths:
+          - "^\\.baseline/.*$"
+          - "^.*gradle$"
+          - "^gradle/wrapper/.*"
+          - "^gradlew$"
+          - "^gradlew.bat$"
+          - "^versions.props$"
+          - "^versions.lock$"
diff --git a/README.md b/README.md
index 8d7694530..042c88157 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ public class MyEndToEndTest {
         .file("src/test/resources/docker-compose.yml")
         .waitingForService("db", HealthChecks.toHaveAllPortsOpen())
         .waitingForService("web", HealthChecks.toRespondOverHttp(8080, (port) -> port.inFormat("https://$HOST:$EXTERNAL_PORT")))
-        .waitingForService("other", (container) -> customServiceCheck(container), Duration.standardMinutes(2))
+        .waitingForService("other", container -> customServiceCheck(container), Duration.standardMinutes(2))
         .waitingForServices(ImmutableList.of("node1", "node2"), toBeHealthyAsACluster())
         .waitingForHostNetworkedPort(5432, toBeOpen())
         .build();
diff --git a/build.gradle b/build.gradle
index 9b779044b..1a51b52d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,24 +2,22 @@ buildscript {
     repositories {
         mavenCentral()
         maven {
-            url "https://dl.bintray.com/palantir/releases"
+            url 'https://dl.bintray.com/palantir/releases/'
         }
         maven {
             url 'https://plugins.gradle.org/m2/'
         }
-        jcenter()
     }
     dependencies {
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.16.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.5.1"
-        classpath 'gradle.plugin.org.inferred:gradle-processors:1.2.15'
+        classpath 'com.palantir.baseline:gradle-baseline-java:0.47.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.netflix.nebula:nebula-publishing-plugin:7.0.12'
+        classpath 'gradle.plugin.org.inferred:gradle-processors:2.1.0'
     }
 }
 
 plugins {
     id 'com.palantir.git-version' version '0.8.0'
-    id 'nebula.lint' version '7.9.5'
     id 'com.palantir.configuration-resolver' version '0.2.0'
 }
 
@@ -32,10 +30,12 @@ allprojects {
 
     repositories {
         mavenCentral()
+        maven {
+            url 'https://dl.bintray.com/palantir/releases/'
+        }
     }
 
     group 'com.palantir.docker.compose'
-
     version gitVersion()
 }
 
@@ -46,7 +46,7 @@ subprojects {
     apply plugin: 'com.palantir.baseline-idea'
     apply plugin: 'org.inferred.processors'
     apply plugin: 'com.palantir.configuration-resolver'
-    apply from: "${rootDir}/gradle/publish.gradle"
+    apply from: "${rootDir}/gradle/publish-jar.gradle"
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -68,9 +68,4 @@ subprojects {
     if (System.env.CIRCLE_TEST_REPORTS) {
         test.reports.junitXml.destination = file(System.env.CIRCLE_TEST_REPORTS)
     }
-
-    if (!System.env.CI) {
-        apply plugin: 'nebula.lint'
-        gradleLint.rules = ['unused-dependency', 'unused-exclude']
-    }
 }
diff --git a/docker-compose-rule-core/core.gradle b/docker-compose-rule-core/build.gradle
similarity index 100%
rename from docker-compose-rule-core/core.gradle
rename to docker-compose-rule-core/build.gradle
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/CustomImmutablesStyle.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/CustomImmutablesStyle.java
index 2b10aa817..1b7838f91 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/CustomImmutablesStyle.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/CustomImmutablesStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/AdditionalEnvironmentValidator.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/AdditionalEnvironmentValidator.java
index d42debe7b..aa6cd9975 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/AdditionalEnvironmentValidator.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/AdditionalEnvironmentValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidator.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidator.java
index a353ef2a5..217c1c1d4 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidator.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,18 +21,18 @@
 import static com.palantir.docker.compose.configuration.EnvironmentVariables.DOCKER_TLS_VERIFY;
 import static java.util.stream.Collectors.joining;
 
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class DaemonEnvironmentValidator implements EnvironmentValidator {
 
     private static final Set<String> ILLEGAL_VARIABLES = ImmutableSet.of(DOCKER_TLS_VERIFY, DOCKER_HOST, DOCKER_CERT_PATH);
     private static final Supplier<DaemonEnvironmentValidator> SUPPLIER = Suppliers.memoize(
-            () -> new DaemonEnvironmentValidator());
+            () -> new DaemonEnvironmentValidator())::get;
 
     public static DaemonEnvironmentValidator instance() {
         return SUPPLIER.get();
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonHostIpResolver.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonHostIpResolver.java
index ded4ffede..bdb2118e8 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonHostIpResolver.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonHostIpResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DockerComposeFiles.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DockerComposeFiles.java
index 4d5f785ea..4951359ee 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DockerComposeFiles.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DockerComposeFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DockerType.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DockerType.java
index 80e8dbfe9..38b138753 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DockerType.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DockerType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/EnvironmentValidator.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/EnvironmentValidator.java
index 5bf2fdc40..ba19bd552 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/EnvironmentValidator.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/EnvironmentValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/EnvironmentVariables.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/EnvironmentVariables.java
index 82fa4f267..ea40ce4f1 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/EnvironmentVariables.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/EnvironmentVariables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/HostIpResolver.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/HostIpResolver.java
index 1979bb286..c422698e6 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/HostIpResolver.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/HostIpResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/PackageVisible.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/PackageVisible.java
index bd43dd32e..8e337120b 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/PackageVisible.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/PackageVisible.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ProjectName.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ProjectName.java
index a893d4784..6daa2e94e 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ProjectName.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ProjectName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,9 +61,7 @@ public static ProjectName random() {
     }
 
     /**
-     * @param name A name consisting of lowercase letters and numbers only.
-     * @return The corresponding project name
-     * @see ProjectName
+     * A name consisting of lowercase letters and numbers only.
      */
     public static ProjectName fromString(String name) {
         return ImmutableProjectName.of(name);
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidator.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidator.java
index 834474c59..d812714c7 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidator.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteHostIpResolver.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteHostIpResolver.java
index bf9084a6d..8e520dec1 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteHostIpResolver.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteHostIpResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ShutdownStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ShutdownStrategy.java
index ba647dd03..499cd858d 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ShutdownStrategy.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ShutdownStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.configuration;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Cluster.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Cluster.java
index a5cab9cdf..99806a9e5 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Cluster.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Cluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.connection;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java
index 2e506c2d6..1fa862ab0 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.palantir.docker.compose.connection;
 
-import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.base.Throwables;
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
@@ -25,6 +24,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class Container {
@@ -33,7 +33,7 @@ public class Container {
     private final Docker docker;
     private final DockerCompose dockerCompose;
 
-    private Supplier<Ports> portMappings = Suppliers.memoize(this::getDockerPorts);
+    private Supplier<Ports> portMappings = Suppliers.memoize(this::getDockerPorts)::get;
 
     public Container(String containerName, Docker docker, DockerCompose dockerCompose) {
         this.containerName = containerName;
@@ -75,6 +75,7 @@ public DockerPort portMappedExternallyTo(int externalPort) {
     }
 
     /**
+     * Deprecated.
      * @deprecated Please use `port(internalPort)` instead.
      */
     @Deprecated
@@ -92,7 +93,7 @@ public DockerPort port(int internalPort) {
 
     public void start() throws IOException, InterruptedException {
         dockerCompose.start(this);
-        portMappings = Suppliers.memoize(this::getDockerPorts);
+        portMappings = Suppliers.memoize(this::getDockerPorts)::get;
     }
 
     public void stop() throws IOException, InterruptedException {
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerCache.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerCache.java
index cede4ab32..e94ef8a69 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerCache.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerName.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerName.java
index c8c187993..dbb2a1d0a 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerName.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.connection;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerNames.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerNames.java
index 40a9c9483..a8b281981 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerNames.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerMachine.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerMachine.java
index 0140d8b05..85d382d1e 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerMachine.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerMachine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerPort.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerPort.java
index e225fa5f1..6faca140b 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerPort.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerPort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/PortMapping.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/PortMapping.java
index 665f0fa52..4c1d74f11 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/PortMapping.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/PortMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Ports.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Ports.java
index 44e5a5bcc..aaced0ef6 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Ports.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Ports.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/State.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/State.java
index 73735ff40..911b15b16 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/State.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/State.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/Attempt.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/Attempt.java
index 2c627356c..863c8fa53 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/Attempt.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/Attempt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/ClusterHealthCheck.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/ClusterHealthCheck.java
index 5f2cbbf27..1c51d59bb 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/ClusterHealthCheck.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/ClusterHealthCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/ClusterWait.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/ClusterWait.java
index 25af11894..f52158963 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/ClusterWait.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/ClusterWait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/Exceptions.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/Exceptions.java
index 9a57e11fb..28c42bd2d 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/Exceptions.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/Exceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/HealthCheck.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/HealthCheck.java
index f9d894165..b1a73e245 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/HealthCheck.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/HealthCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/HealthChecks.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/HealthChecks.java
index 74ccc8035..d6b4692f5 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/HealthChecks.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/HealthChecks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailure.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailure.java
index 10072a565..e7344fee4 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailure.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/AggressiveShutdownStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/AggressiveShutdownStrategy.java
index 9aabae5d0..aefeb24c9 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/AggressiveShutdownStrategy.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/AggressiveShutdownStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.execution;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/AggressiveShutdownWithNetworkCleanupStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/AggressiveShutdownWithNetworkCleanupStrategy.java
index f1451f71a..27bd3f1ce 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/AggressiveShutdownWithNetworkCleanupStrategy.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/AggressiveShutdownWithNetworkCleanupStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.execution;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Command.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Command.java
index 815e5b9e6..5afe7eb20 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Command.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerCompose.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerCompose.java
index 30869c636..e2611e152 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerCompose.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerCompose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DefaultDockerCompose.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DefaultDockerCompose.java
index 5fa062d50..c942e1f7a 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DefaultDockerCompose.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DefaultDockerCompose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,10 +55,10 @@ public class DefaultDockerCompose implements DockerCompose {
 
     public DefaultDockerCompose(DockerComposeFiles dockerComposeFiles, DockerMachine dockerMachine, ProjectName projectName) {
         this(DockerComposeExecutable.builder()
-            .dockerComposeFiles(dockerComposeFiles)
-            .dockerConfiguration(dockerMachine)
-            .projectName(projectName)
-            .build(), dockerMachine);
+                .dockerComposeFiles(dockerComposeFiles)
+                .dockerConfiguration(dockerMachine)
+                .projectName(projectName)
+                .build(), dockerMachine);
     }
 
     public DefaultDockerCompose(DockerComposeExecutable rawExecutable, DockerMachine dockerMachine) {
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DelegatingDockerCompose.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DelegatingDockerCompose.java
index e3fda2003..b94f71570 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DelegatingDockerCompose.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DelegatingDockerCompose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Docker.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Docker.java
index ca3389efc..be742a215 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Docker.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Docker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import java.util.Collection;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerCommandLocations.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerCommandLocations.java
index a1e0c0a06..64495a4de 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerCommandLocations.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerCommandLocations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerCompose.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerCompose.java
index 08cce8fe8..7aad1b173 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerCompose.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerCompose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecArgument.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecArgument.java
index 93b976f87..e2215e1ed 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecArgument.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecArgument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecOption.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecOption.java
index ffd94af6c..09527392a 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecOption.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java
index 9c2daed21..cbc6aaa33 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeRunArgument.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeRunArgument.java
index 62e22132e..d83173f63 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeRunArgument.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeRunArgument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeRunOption.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeRunOption.java
index abeca01a0..e0eb9717e 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeRunOption.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeRunOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeVersion.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeVersion.java
index b68f40641..54e81be95 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeVersion.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerConfiguration.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerConfiguration.java
index ece6d1080..e7e308412 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerConfiguration.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java
index 1ff5cf01e..1b47443ec 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutionException.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutionException.java
index bab99b7c9..f60cc400a 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutionException.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerForMacHostsIssue.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerForMacHostsIssue.java
index 5ade1bda3..e8ed064d1 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerForMacHostsIssue.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerForMacHostsIssue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.execution;
@@ -26,6 +26,7 @@ public class DockerForMacHostsIssue {
             + "\nFor more information, see https://github.com/docker/compose/issues/3419#issuecomment-221793401\n\n";
     private static volatile boolean checkPerformed = false;
 
+    @SuppressWarnings("checkstyle:BanSystemErr")
     public static void issueWarning() {
         if (!checkPerformed) {
             if (onMacOsX() && !localunixsocketRedirectedInEtcHosts()) {
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ErrorHandler.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ErrorHandler.java
index 185f09b53..76d089607 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ErrorHandler.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Executable.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Executable.java
index 880eae83b..4169a5584 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Executable.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Executable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/GracefulShutdownStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/GracefulShutdownStrategy.java
index e466cbc1a..f0bfb10a0 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/GracefulShutdownStrategy.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/GracefulShutdownStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.execution;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/KillDownShutdownStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/KillDownShutdownStrategy.java
index 32f37bec7..200e8ad77 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/KillDownShutdownStrategy.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/KillDownShutdownStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.execution;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ProcessResult.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ProcessResult.java
index 98f7fcd7e..2d2cce0bb 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ProcessResult.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/ProcessResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Retryer.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Retryer.java
index ab27434bf..d09e67603 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Retryer.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/Retryer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/RetryingDockerCompose.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/RetryingDockerCompose.java
index de173391b..a64fc05ba 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/RetryingDockerCompose.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/RetryingDockerCompose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/SkipShutdownStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/SkipShutdownStrategy.java
index ba9dcf2cc..41059b258 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/SkipShutdownStrategy.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/SkipShutdownStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.execution;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/DoNothingLogCollector.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/DoNothingLogCollector.java
index ffddcafd3..1e117c5d2 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/DoNothingLogCollector.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/DoNothingLogCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/FileLogCollector.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/FileLogCollector.java
index 677417507..68f332116 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/FileLogCollector.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/FileLogCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogCollector.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogCollector.java
index 6706b6a19..9cb5013a6 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogCollector.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java
index 471e3d561..7b5732b88 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.logging;
diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/matchers/AvailablePortMatcher.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/matchers/AvailablePortMatcher.java
index 90b500f04..1e58dd0dc 100644
--- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/matchers/AvailablePortMatcher.java
+++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/matchers/AvailablePortMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/AggressiveShutdownStrategyTest.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/AggressiveShutdownStrategyTest.java
index 9240bcf82..8b1fb4fa1 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/AggressiveShutdownStrategyTest.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/AggressiveShutdownStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose;
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyTest.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyTest.java
index 700157e56..79960b3d2 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyTest.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose;
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/TestContainerNames.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/TestContainerNames.java
index c539a4ff7..1bbd6ed63 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/TestContainerNames.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/TestContainerNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose;
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/AdditionalEnvironmentValidatorShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/AdditionalEnvironmentValidatorShould.java
index 0e752e43b..9e55bfbd9 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/AdditionalEnvironmentValidatorShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/AdditionalEnvironmentValidatorShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidatorShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidatorShould.java
index 6aa3d3112..5218ad531 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidatorShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidatorShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DaemonHostIpResolverShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DaemonHostIpResolverShould.java
index b4a075a53..ea208f488 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DaemonHostIpResolverShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DaemonHostIpResolverShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DockerComposeFilesShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DockerComposeFilesShould.java
index a7a2995fa..8c652501b 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DockerComposeFilesShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DockerComposeFilesShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DockerTypeShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DockerTypeShould.java
index 3a7f442d5..07ace0ab3 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DockerTypeShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/DockerTypeShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/MockDockerEnvironment.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/MockDockerEnvironment.java
index 1fea07b66..4071b1189 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/MockDockerEnvironment.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/MockDockerEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/ProjectNameShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/ProjectNameShould.java
index 021fc6410..dad303c4c 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/ProjectNameShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/ProjectNameShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidatorShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidatorShould.java
index f4d309a23..db1a0c0eb 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidatorShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidatorShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/RemoteHostIpResolverShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/RemoteHostIpResolverShould.java
index 717e081db..118b6128d 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/RemoteHostIpResolverShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/configuration/RemoteHostIpResolverShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerCacheShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerCacheShould.java
index 9a77b5f61..64cadd3be 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerCacheShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerCacheShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerIntegrationTests.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerIntegrationTests.java
index e2ecfa8aa..3a4b6827e 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerIntegrationTests.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.connection;
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerNameShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerNameShould.java
index ce82527b7..6147c74fe 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerNameShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerNameShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.connection;
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerShould.java
index 738290888..5ddf7fa63 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/ContainerShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/DockerPortFormattingShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/DockerPortFormattingShould.java
index dd7786fd1..94b252473 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/DockerPortFormattingShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/DockerPortFormattingShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/LocalBuilderShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/LocalBuilderShould.java
index 45c368cec..5c6c699aa 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/LocalBuilderShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/LocalBuilderShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/PortsShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/PortsShould.java
index 29d6c2c21..431e54aca 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/PortsShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/PortsShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/RemoteBuilderShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/RemoteBuilderShould.java
index fdd67912e..7d4d240f9 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/RemoteBuilderShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/RemoteBuilderShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/ClusterWaitShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/ClusterWaitShould.java
index 05c275cf8..b1a339e67 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/ClusterWaitShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/ClusterWaitShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/ExceptionsShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/ExceptionsShould.java
index 89fe51c3b..553ec961b 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/ExceptionsShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/ExceptionsShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/HttpHealthCheckShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/HttpHealthCheckShould.java
index 79c66289c..90d86607e 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/HttpHealthCheckShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/HttpHealthCheckShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/PortsHealthCheckShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/PortsHealthCheckShould.java
index 9c181b5ad..b55551ca2 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/PortsHealthCheckShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/PortsHealthCheckShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailureMatchers.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailureMatchers.java
index c47cc0a86..295f1547e 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailureMatchers.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailureMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailureShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailureShould.java
index ae99b8749..b0f48c939 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailureShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/waiting/SuccessOrFailureShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/CommandShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/CommandShould.java
index a4bbd70e0..859cc43a7 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/CommandShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/CommandShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public class CommandShould {
     private final Consumer<String> logConsumer = s -> consumedLogLines.add(s);
 
     @Before
-    public void setup() throws IOException {
+    public void before() throws IOException {
         when(dockerComposeExecutable.execute(anyVararg())).thenReturn(executedProcess);
         dockerComposeCommand = new Command(dockerComposeExecutable, logConsumer);
 
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerComposeShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerComposeShould.java
index b0f3b5c54..a577db65c 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerComposeShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerComposeShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 import com.google.common.collect.ImmutableSet;
 import java.io.IOException;
 import java.util.Set;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerCommandLocationsShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerCommandLocationsShould.java
index f5b2e44eb..7ff4a01a8 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerCommandLocationsShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerCommandLocationsShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public class DockerCommandLocationsShould {
     private String goodLocation;
 
     @Before
-    public void setup() throws IOException {
+    public void before() throws IOException {
         goodLocation = folder.newFile("docker-compose.yml").getAbsolutePath();
     }
 
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeExecOptionShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeExecOptionShould.java
index 914a5564a..84055ee74 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeExecOptionShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeExecOptionShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeShould.java
index eb5c3111c..1e2a946b4 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public class DockerComposeShould {
     private final Container container = mock(Container.class);
 
     @Before
-    public void setup() throws IOException {
+    public void before() throws IOException {
         when(dockerMachine.getIp()).thenReturn("0.0.0.0");
         when(executor.execute(anyVararg())).thenReturn(executedProcess);
         when(executedProcess.getInputStream()).thenReturn(toInputStream("0.0.0.0:7000->7000/tcp"));
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeVersionShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeVersionShould.java
index f5867d2d1..9e20a3b87 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeVersionShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerComposeVersionShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerShould.java
index ab849a7f0..89ee99b49 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/DockerShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ public class DockerShould {
     private final Process executedProcess = mock(Process.class);
 
     @Before
-    public void setup() throws IOException {
+    public void before() throws IOException {
         when(executor.execute(anyVararg())).thenReturn(executedProcess);
         when(executedProcess.exitValue()).thenReturn(0);
     }
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/GracefulShutdownStrategyShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/GracefulShutdownStrategyShould.java
index ba7f02a9d..d57bc8cc3 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/GracefulShutdownStrategyShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/GracefulShutdownStrategyShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.execution;
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/KillDownShutdownStrategyShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/KillDownShutdownStrategyShould.java
index c48ed55e6..fba2d0aad 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/KillDownShutdownStrategyShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/KillDownShutdownStrategyShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.execution;
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/RetryerShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/RetryerShould.java
index 1a2764677..f590a5d90 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/RetryerShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/RetryerShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/RetryingDockerComposeShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/RetryingDockerComposeShould.java
index e7b7de572..8f524d70e 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/RetryingDockerComposeShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/RetryingDockerComposeShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/FileLogCollectorShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/FileLogCollectorShould.java
index ae0b2d04c..c832b6929 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/FileLogCollectorShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/FileLogCollectorShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public class FileLogCollectorShould {
     private LogCollector logCollector;
 
     @Before
-    public void setup() throws IOException {
+    public void before() throws IOException {
         logDirectory = logDirectoryParent.newFolder();
         logCollector = new FileLogCollector(logDirectory);
     }
@@ -103,7 +103,7 @@ public void not_collect_any_logs_when_no_containers_are_running() throws IOExcep
     public void collect_logs_when_one_container_is_running_and_terminates_before_start_collecting_is_run()
             throws Exception {
         when(compose.services()).thenReturn(ImmutableList.of("db"));
-        when(compose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer((args) -> {
+        when(compose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer(args -> {
             OutputStream outputStream = (OutputStream) args.getArguments()[1];
             IOUtils.write("log", outputStream);
             return false;
@@ -119,7 +119,7 @@ public void collect_logs_when_one_container_is_running_and_does_not_terminate_un
             throws Exception {
         when(compose.services()).thenReturn(ImmutableList.of("db"));
         CountDownLatch latch = new CountDownLatch(1);
-        when(compose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer((args) -> {
+        when(compose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer(args -> {
             if (!latch.await(1, TimeUnit.SECONDS)) {
                 throw new RuntimeException("Latch was not triggered");
             }
@@ -139,7 +139,7 @@ public void collect_logs_when_one_container_is_running_and_does_not_terminate()
             throws IOException, InterruptedException {
         when(compose.services()).thenReturn(ImmutableList.of("db"));
         CountDownLatch latch = new CountDownLatch(1);
-        when(compose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer((args) -> {
+        when(compose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer(args -> {
             OutputStream outputStream = (OutputStream) args.getArguments()[1];
             IOUtils.write("log", outputStream);
             try {
@@ -163,14 +163,14 @@ public void collect_logs_when_one_container_is_running_and_does_not_terminate()
     public void collect_logs_in_parallel_for_two_containers() throws IOException, InterruptedException {
         when(compose.services()).thenReturn(ImmutableList.of("db", "db2"));
         CountDownLatch dbLatch = new CountDownLatch(1);
-        when(compose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer((args) -> {
+        when(compose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer(args -> {
             OutputStream outputStream = (OutputStream) args.getArguments()[1];
             IOUtils.write("log", outputStream);
             dbLatch.countDown();
             return true;
         });
         CountDownLatch db2Latch = new CountDownLatch(1);
-        when(compose.writeLogs(eq("db2"), any(OutputStream.class))).thenAnswer((args) -> {
+        when(compose.writeLogs(eq("db2"), any(OutputStream.class))).thenAnswer(args -> {
             OutputStream outputStream = (OutputStream) args.getArguments()[1];
             IOUtils.write("other", outputStream);
             db2Latch.countDown();
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java
index 4db0cfe55..dd66ae671 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose.logging;
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/AvailablePortMatcherShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/AvailablePortMatcherShould.java
index 76d189152..3cd327e1c 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/AvailablePortMatcherShould.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/AvailablePortMatcherShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/DockerMachineEnvironmentMatcher.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/DockerMachineEnvironmentMatcher.java
index 7f15b379b..b59b113ce 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/DockerMachineEnvironmentMatcher.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/DockerMachineEnvironmentMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/IOMatchers.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/IOMatchers.java
index 41cf9d204..5e5382dcb 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/IOMatchers.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/IOMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/ValueCachingMatcher.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/ValueCachingMatcher.java
index b7c8e3f26..798ab2524 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/ValueCachingMatcher.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/ValueCachingMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/utils/MockitoMultiAnswer.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/utils/MockitoMultiAnswer.java
index 014beacde..63e08d5c4 100644
--- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/utils/MockitoMultiAnswer.java
+++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/utils/MockitoMultiAnswer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-junit4/junit4.gradle b/docker-compose-rule-junit4/build.gradle
similarity index 100%
rename from docker-compose-rule-junit4/junit4.gradle
rename to docker-compose-rule-junit4/build.gradle
diff --git a/docker-compose-rule-junit4/src/main/java/com/palantir/docker/compose/DockerComposeRule.java b/docker-compose-rule-junit4/src/main/java/com/palantir/docker/compose/DockerComposeRule.java
index b05c59402..567975b6d 100644
--- a/docker-compose-rule-junit4/src/main/java/com/palantir/docker/compose/DockerComposeRule.java
+++ b/docker-compose-rule-junit4/src/main/java/com/palantir/docker/compose/DockerComposeRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 package com.palantir.docker.compose;
 
@@ -199,6 +199,7 @@ public Builder saveLogsTo(String path) {
         }
 
         /**
+         * Deprecated.
          * @deprecated Please use {@link DockerComposeRule#shutdownStrategy()} with {@link ShutdownStrategy#SKIP} instead.
          */
         @Deprecated
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/AggressiveShutdownStrategyIntegrationTest.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/AggressiveShutdownStrategyIntegrationTest.java
index 058e15e0d..2cbf3bae1 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/AggressiveShutdownStrategyIntegrationTest.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/AggressiveShutdownStrategyIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose;
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyIntegrationTest.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyIntegrationTest.java
index 35eacafa7..270a95eec 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyIntegrationTest.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose;
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleIntegrationTest.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleIntegrationTest.java
index 8162b087e..a07ef36e0 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleIntegrationTest.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleNativeHealthcheckIntegrationTest.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleNativeHealthcheckIntegrationTest.java
index 6ad62740f..08d7cac5f 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleNativeHealthcheckIntegrationTest.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleNativeHealthcheckIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  */
 
 package com.palantir.docker.compose;
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleShould.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleShould.java
index 0684c7a38..3708304ee 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleShould.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleShould.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,7 +135,7 @@ public void calls_pull_build_and_up_when_tests_are_run_and_pullOnStartup_is_true
     public void pass_wait_for_service_when_check_is_true() throws IOException, InterruptedException {
         AtomicInteger timesCheckCalled = new AtomicInteger(0);
         withComposeExecutableReturningContainerFor("db");
-        HealthCheck<Container> checkCalledOnce = (container) -> SuccessOrFailure.fromBoolean(timesCheckCalled.incrementAndGet() == 1, "not called once yet");
+        HealthCheck<Container> checkCalledOnce = container -> SuccessOrFailure.fromBoolean(timesCheckCalled.incrementAndGet() == 1, "not called once yet");
         defaultBuilder().waitingForService("db", checkCalledOnce).build().before();
         assertThat(timesCheckCalled.get(), is(1));
     }
@@ -157,7 +157,7 @@ public void wait_for_multiple_services_on_wait() throws IOException, Interrupted
     public void pass_wait_for_service_when_check_is_true_after_being_false() throws IOException, InterruptedException {
         AtomicInteger timesCheckCalled = new AtomicInteger(0);
         withComposeExecutableReturningContainerFor("db");
-        HealthCheck<Container> checkCalledTwice = (container) -> SuccessOrFailure.fromBoolean(timesCheckCalled.incrementAndGet() == 2, "not called twice yet");
+        HealthCheck<Container> checkCalledTwice = container -> SuccessOrFailure.fromBoolean(timesCheckCalled.incrementAndGet() == 2, "not called twice yet");
         defaultBuilder().waitingForService("db", checkCalledTwice).build().before();
         assertThat(timesCheckCalled.get(), is(2));
     }
@@ -171,7 +171,7 @@ public void throw_exception_if_a_wait_for_service_check_remains_false_until_the_
         exception.expectMessage("failed to pass a startup check");
         exception.expectMessage("oops");
 
-        defaultBuilder().waitingForService("db", (container) -> SuccessOrFailure.failure("oops"), millis(200)).build().before();
+        defaultBuilder().waitingForService("db", container -> SuccessOrFailure.failure("oops"), millis(200)).build().before();
     }
 
     @Test
@@ -236,7 +236,7 @@ public void be_able_to_save_logs_to_a_directory_while_containers_are_running()
         when(dockerCompose.id(any())).thenReturn(Optional.of("abcde"));
         when(mockDocker.state("abcde")).thenReturn(State.HEALTHY);
         CountDownLatch latch = new CountDownLatch(1);
-        when(dockerCompose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer((args) -> {
+        when(dockerCompose.writeLogs(eq("db"), any(OutputStream.class))).thenAnswer(args -> {
             OutputStream outputStream = (OutputStream) args.getArguments()[1];
             IOUtils.write("db log", outputStream);
             latch.countDown();
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleUpContainerIntegrationTest.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleUpContainerIntegrationTest.java
index 488a2b949..c3e55acd1 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleUpContainerIntegrationTest.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleUpContainerIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/HostNetworkedPortsIntegrationTest.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/HostNetworkedPortsIntegrationTest.java
index b16a2af3e..b69a60069 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/HostNetworkedPortsIntegrationTest.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/HostNetworkedPortsIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import com.palantir.docker.compose.connection.DockerPort;
 import com.palantir.docker.compose.connection.waiting.HealthCheck;
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
-
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.Test;
 
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java
index 84961cc78..df95e8539 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/execution/EnvironmentVariableIntegrationTest.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/execution/EnvironmentVariableIntegrationTest.java
index 304ba7dcd..22ff9c10f 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/execution/EnvironmentVariableIntegrationTest.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/execution/EnvironmentVariableIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/logging/LoggingIntegrationTest.java b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/logging/LoggingIntegrationTest.java
index f227e0bbe..4ba8fd39e 100644
--- a/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/logging/LoggingIntegrationTest.java
+++ b/docker-compose-rule-junit4/src/test/java/com/palantir/docker/compose/logging/LoggingIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Palantir Technologies, Inc. All rights reserved.
+ * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public class LoggingIntegrationTest {
     private DockerComposeRule dockerComposeRule;
 
     @Before
-    public void setUp() {
+    public void before() {
         dockerComposeRule = DockerComposeRule.builder()
                 .file("src/test/resources/docker-compose.yaml")
                 .waitingForService("db", toHaveAllPortsOpen())
diff --git a/gradle/publish-jar.gradle b/gradle/publish-jar.gradle
new file mode 100644
index 000000000..1a867d59e
--- /dev/null
+++ b/gradle/publish-jar.gradle
@@ -0,0 +1,30 @@
+// This file is managed by the excavator 'consistent-publish-scripts' check, changes will be overwritten.
+apply plugin: 'com.jfrog.bintray'
+apply plugin: 'nebula.maven-publish'
+apply plugin: 'nebula.maven-resolved-dependencies'
+apply plugin: 'nebula.javadoc-jar'
+apply plugin: 'nebula.source-jar'
+
+jar {
+    manifest {
+        attributes("Implementation-Version" : project.version)
+    }
+}
+
+bintray {
+    user = System.env.BINTRAY_USER
+    key = System.env.BINTRAY_KEY
+    publish = true
+    pkg {
+        repo = 'releases'
+        name = rootProject.name
+        userOrg = 'palantir'
+        licenses = ['Apache-2.0']
+        publications = ['nebula']
+    }
+}
+
+publish.dependsOn bintrayUpload
+bintrayUpload.onlyIf {
+    versionDetails().isCleanTag
+}
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
deleted file mode 100644
index f3de754ce..000000000
--- a/gradle/publish.gradle
+++ /dev/null
@@ -1,75 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
-apply plugin: 'com.jfrog.artifactory'
-
-task sourceJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier 'sources'
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-    destinationDir rootProject.file("${buildDir}/libs")
-}
-
-tasks.build.dependsOn sourceJar, javadocJar
-
-publishing {
-    publications {
-        bintray(MavenPublication) {
-            from components.java
-            artifact(sourceJar)
-            artifact(javadocJar)
-            version project.version.toString().replaceAll(/-.*/, '-SNAPSHOT')
-        }
-    }
-}
-
-
-artifactory {
-    publish {
-        contextUrl = 'https://oss.jfrog.org/artifactory'
-        repository {
-            repoKey = (project.version =~ /-/ ? 'oss-snapshot-local' : 'oss-release-local')
-            username = System.env.BINTRAY_USER
-            password = System.env.BINTRAY_KEY
-            maven = true
-        }
-        defaults {
-            publications (publishing.publications.bintray)
-            properties = ['git': project.version.toString()]
-        }
-    }
-}
-artifactoryPublish.dependsOn 'generatePomFileForBintrayPublication', 'build'
-
-bintray {
-    user = System.env.BINTRAY_USER
-    key = System.env.BINTRAY_KEY
-    pkg {
-        userOrg = 'palantir'
-        repo = 'releases'
-        name = 'docker-compose-rule'
-        licenses = ['Apache-2.0']
-        publications = ['bintray']
-    }
-    publish = true;
-}
-
-bintrayUpload.onlyIf {
-    println "Attempting to publish with project version: " + project.version.toString()
-
-    def versionIsInCorrectFormat = project.version.toString() ==~ /\d+\.\d+\.\d+/
-
-    if (!versionIsInCorrectFormat) {
-      println "Cannot publish project with version " + project.version.toString() + 
-              "; it must be in form 'major.minor.patch'"
-    }
-
-    System.env.BINTRAY_USER && System.env.BINTRAY_KEY && versionIsInCorrectFormat
-}
-
-bintrayUpload.dependsOn 'generatePomFileForBintrayPublication', 'build'
-
-
diff --git a/settings.gradle b/settings.gradle
index 39846a256..d1542a6cc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,6 @@
+rootProject.name='docker-compose-rule'
+
 include 'docker-compose-rule-core'
 include 'docker-compose-rule-junit4'
 
-rootProject.name='docker-compose-rule'
-rootProject.children.each { project ->
-    String buildFileName = project.name.replace("${rootProject.name}-", "");
-    project.buildFileName = "${buildFileName}.gradle"
-    assert project.buildFile.isFile()
-}
+enableFeaturePreview('IMPROVED_POM_SUPPORT')