diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index fd1fa389..acf39688 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.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."/>
diff --git a/build.gradle b/build.gradle
index 71f4ae22..e7e99f84 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,10 +9,10 @@ buildscript {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.27.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.18.0'
-        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.javaformat:gradle-palantir-java-format:2.83.0'
+        classpath 'com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.26.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:3.7.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.16.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.51.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.2.0'
         classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.8.0'
         classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:4.1.0'
diff --git a/versions.lock b/versions.lock
index bb9e371b..1cbfd19e 100644
--- a/versions.lock
+++ b/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)
 
diff --git a/versions.props b/versions.props
index 1be5c281..3839129d 100644
--- a/versions.props
+++ b/versions.props
@@ -6,6 +6,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