Excavator: Upgrades Baseline to the latest version

.baseline/checkstyle/checkstyle.xml

@@ -173,6 +173,7 @@
         </module>
         <module name="IllegalType"> <!-- Java Coding Guide: Limit coupling on concrete classes -->
             <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"/>
+            <message key="illegal.type" value="Usage of type ''{0}'' is not allowed to limit coupling on concrete classes. For example, prefer Multimap over HashMultimap, List over ArrayList, and Set over TreeSet."/>
         </module>
         <module name="IllegalType">
             <property name="id" value="BanGuavaCaches"/>
@@ -292,14 +293,6 @@
             <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)."/>
-        </module>
-        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Check parameters for validity -->
-            <property name="format" value="Validate\.notNull\((?!.*,)([^()]*(\(([^()]*|\(([^()]*|\([^()]*\))*\))*\)[^()]*)*)\)"/>
-            <property name="message" value="Use Validate.notNull(Object, String)."/>
-        </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="^\s*super\(\);"/>
             <property name="message" value="This is unnecessary; please delete."/>

build.gradle

@@ -12,7 +12,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.72.0'
         classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.15.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:3.2.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.16.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.60.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.0.0'
         classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.5.0'
         classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:4.1.0'

docker-proxy-rule-core/src/main/java/com/palantir/docker/proxy/DockerContainerInfoUtils.java

@@ -50,6 +50,7 @@ private DockerContainerInfoUtils() {
         // Utility class
     }
 
+    @SuppressWarnings("for-rollout:deprecation")
     public static List<String> getAllNamesForContainerId(DockerExecutable docker, String containerId) {
         try {
             String labelsFormat = StreamEx.of(DOCKER_NAME_LABELS)

docker-proxy-rule-core/src/main/java/com/palantir/docker/proxy/DockerProxyManager.java

@@ -103,6 +103,7 @@ public void after() {
         dockerComposeRule.after();
     }
 
+    @SuppressWarnings("for-rollout:deprecation")
     private static File getDockerComposeFile(String networkName, String imageName) {
         try {
             File proxyFile = File.createTempFile("proxy", ".yml");

docker-proxy-rule-core/src/test/java/com/palantir/docker/proxy/DockerProxySelectorTest.java

@@ -134,6 +134,7 @@ private static Cluster setupProxyContainer() {
                 .build();
     }
 
+    @SuppressWarnings("for-rollout:deprecation")
     private static URI createUriUnsafe(String uriString) {
         try {
             return new URI(uriString);

versions.lock

@@ -70,7 +70,7 @@ one.util:streamex:0.8.1 (2 constraints: cd1a403c)
 
 org.apache.commons:commons-lang3:3.7 (1 constraints: 661571a7)
 
-org.apiguardian:apiguardian-api:1.1.2 (5 constraints: 105480ac)
+org.apiguardian:apiguardian-api:1.1.2 (6 constraints: 5366ce6e)
 
 org.awaitility:awaitility:4.0.2 (1 constraints: c015bbd2)
 
@@ -108,7 +108,9 @@ org.junit.jupiter:junit-jupiter-engine:5.8.2 (1 constraints: 0c0edf3b)
 
 org.junit.jupiter:junit-jupiter-params:5.8.2 (1 constraints: 0c0edf3b)
 
-org.junit.platform:junit-platform-engine:1.8.2 (1 constraints: ab1027b4)
+org.junit.platform:junit-platform-engine:1.8.2 (2 constraints: f522a808)
+
+org.junit.platform:junit-platform-launcher:1.8.2 (1 constraints: 0d050a36)
 
 org.mockito:mockito-core:4.4.0 (2 constraints: f11021d5)
 

versions.props

@@ -5,6 +5,7 @@ junit:junit = 4.13.2
 one.util:streamex = 0.8.1
 org.assertj:assertj-core = 3.22.0
 org.junit.jupiter:* = 5.8.2
+org.junit.platform:* = 1.8.2
 org.mockito:* = 4.4.0
 org.hamcrest:* = 2.1
 net.bytebuddy:* = 1.14.11