From 1a545131e2b88c2ddbc28ae90d65bef0c0af574c Mon Sep 17 00:00:00 2001
From: svc-excavator-bot <svc-excavator-bot@palantir.com>
Date: Tue, 17 Sep 2019 16:15:31 +0000
Subject: [PATCH] Excavator: Upgrades Baseline to the latest version

---
 .baseline/checkstyle/checkstyle-suppressions.xml     |  5 ++---
 .baseline/checkstyle/checkstyle.xml                  | 12 +++++++++---
 build.gradle                                         |  2 +-
 .../palantir/docker/proxy/DockerProxySelector.java   |  3 +--
 .../docker/proxy/DockerContainerInfoUtilsTest.java   |  4 ++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
index 16adf10ba..c0f855b14 100644
--- a/.baseline/checkstyle/checkstyle-suppressions.xml
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <!-- IMPORTANT ECLIPSE NOTE: If you change this file, you must restart Eclipse
  for your changes to take effect in its Checkstyle integration. -->
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index c51899c47..268ebe3fc 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     Palantir Baseline Checkstyle configuration.
@@ -127,6 +127,11 @@
             <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"> <!-- Only relevant for pre-Java 11 because javafx is gone completely in Java 11 -->
+            <property name="id" value="BanJavafx"/>
+            <property name="illegalPkgs" value="javafx"/>
+            <message key="import.illegal" value="Must not import javafx classes because some OpenJDK builds do not include javafx."/>
+        </module>
         <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
             <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."/>
@@ -417,6 +422,7 @@
             <property name="allowEmptyMethods" value="true"/>
             <property name="allowEmptyTypes" value="true"/>
             <property name="allowEmptyLoops" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
             <property name="ignoreEnhancedForColon" value="false"/>
             <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
             <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
@@ -430,7 +436,7 @@
         </module>
         <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
-            <property name="ignoredAnnotations" value="Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+            <property name="ignoredAnnotations" value="ParameterizedTest, 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"/>
diff --git a/build.gradle b/build.gradle
index d87b11e9d..9447aeba5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.9.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:9.4.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.50.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.6.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.11.0'
         classpath 'gradle.plugin.com.palantir.configurationresolver:gradle-configuration-resolver-plugin:0.2.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:2.1.0'
diff --git a/src/main/java/com/palantir/docker/proxy/DockerProxySelector.java b/src/main/java/com/palantir/docker/proxy/DockerProxySelector.java
index f4ed4c981..e6f1f4f2a 100644
--- a/src/main/java/com/palantir/docker/proxy/DockerProxySelector.java
+++ b/src/main/java/com/palantir/docker/proxy/DockerProxySelector.java
@@ -4,7 +4,6 @@
 
 package com.palantir.docker.proxy;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.palantir.docker.compose.connection.Cluster;
 import java.io.IOException;
@@ -43,7 +42,7 @@ public List<Proxy> select(URI uri) {
 
     @Override
     public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
-        Preconditions.checkArgument(uri != null && sa != null && ioe != null, "Invalid connectFailed call");
+        com.palantir.logsafe.Preconditions.checkArgument(uri != null && sa != null && ioe != null, "Invalid connectFailed call");
         delegate.connectFailed(uri, sa, ioe);
     }
 }
diff --git a/src/test/java/com/palantir/docker/proxy/DockerContainerInfoUtilsTest.java b/src/test/java/com/palantir/docker/proxy/DockerContainerInfoUtilsTest.java
index 5808aea4d..f65cb1838 100644
--- a/src/test/java/com/palantir/docker/proxy/DockerContainerInfoUtilsTest.java
+++ b/src/test/java/com/palantir/docker/proxy/DockerContainerInfoUtilsTest.java
@@ -5,7 +5,7 @@
 package com.palantir.docker.proxy;
 
 import static com.palantir.docker.proxy.DockerContainerInfoUtils.IP_FORMAT_STRING;
-import static org.junit.Assert.assertFalse;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
@@ -34,7 +34,7 @@ public void getContainerIpFromIdDoesNotThrowWhenContainerIsStopped() throws IOEx
         when(dockerExecutable.execute("inspect", "--format", IP_FORMAT_STRING, CONTAINER_ID)).thenReturn(response);
 
         Optional<String> ip = DockerContainerInfoUtils.getContainerIpFromId(dockerExecutable, CONTAINER_ID);
-        assertFalse(ip.isPresent());
+        assertThat(ip.isPresent()).isFalse();
     }
 
     private InputStream getDockerOutputForStoppedContainer() {