diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 792229cfc..268ebe3fc 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -422,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."/>
@@ -435,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 f506d46b5..08556956d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:5.0.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:13.5.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.57.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.5.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.11.2'
     }
 }
diff --git a/ssl-config/build.gradle b/ssl-config/build.gradle
index ad9ec33ec..1e49b05ba 100644
--- a/ssl-config/build.gradle
+++ b/ssl-config/build.gradle
@@ -5,10 +5,11 @@ apply plugin: 'com.palantir.revapi'
 
 dependencies {
     compile "com.fasterxml.jackson.core:jackson-databind"
+    implementation 'com.palantir.safe-logging:preconditions'
 
-    testCompile project(':extras:jackson-support')
-    testCompile "org.assertj:assertj-core"
-    testCompile "junit:junit"
+    testImplementation project(':extras:jackson-support')
+    testImplementation "org.assertj:assertj-core"
+    testImplementation "junit:junit"
 
     annotationProcessor "org.immutables:value"
     compileOnly 'org.immutables:value::annotations'
diff --git a/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java b/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java
index 48fcd02d1..9f547b328 100644
--- a/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java
+++ b/ssl-config/src/main/java/com/palantir/conjure/java/api/config/ssl/SslConfiguration.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import java.nio.file.Path;
 import java.util.Optional;
 import org.immutables.value.Value;
@@ -66,11 +67,11 @@ public StoreType keyStoreType() {
     @Value.Check
     protected final void check() {
         if (keyStorePath().isPresent() != keyStorePassword().isPresent()) {
-            throw new IllegalArgumentException(
+            throw new SafeIllegalArgumentException(
                     "keyStorePath and keyStorePassword must both be present or both be absent");
         }
         if (keyStoreKeyAlias().isPresent() && !keyStorePath().isPresent()) {
-            throw new IllegalArgumentException(
+            throw new SafeIllegalArgumentException(
                     "keyStorePath must be present if keyStoreKeyAlias is present");
         }
     }