diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index f541b63e2..43ec38a3a 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -84,11 +84,13 @@
         <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
         <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
             <property name="excludes" value="
+                com.google.common.base.Preconditions.*,
+                com.palantir.logsafe.Preconditions.*,
                 java.util.Collections.*,
                 java.util.stream.Collectors.*,
-                com.palantir.logsafe.Preconditions.*,
-                com.google.common.base.Preconditions.*,
-                org.apache.commons.lang3.Validate.*"/>
+                org.apache.commons.lang3.Validate.*,
+                org.assertj.core.api.Assertions.*,
+                org.mockito.Mockito.*"/>
         </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]$)"/>
diff --git a/build.gradle b/build.gradle
index 04da991e7..3516ddc6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:5.1.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.0.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.15.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.17.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
     }
 }
diff --git a/extras/jackson-support/src/test/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappersTest.java b/extras/jackson-support/src/test/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappersTest.java
index 95c0020a9..98bbd7d77 100644
--- a/extras/jackson-support/src/test/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappersTest.java
+++ b/extras/jackson-support/src/test/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappersTest.java
@@ -57,7 +57,7 @@ public void deserializeJdk8ModulePresentOptional() throws IOException {
 
     @Test
     public void deserializeJdk8ModuleAbsentOptional() throws IOException {
-        assertThat(MAPPER.readValue("null", Optional.class)).isEqualTo(Optional.empty());
+        assertThat(MAPPER.readValue("null", Optional.class)).isNotPresent();
     }
 
     @Test