diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 494192ad..1a086c49 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -63,7 +63,9 @@
             <property name="tokens" value="VARIABLE_DEF"/>
             <property name="allowSamelineMultipleAnnotations" value="true"/>
         </module>
-        <module name="AnnotationUseStyle"/> <!-- Java Style Guide: Annotations -->
+        <module name="AnnotationUseStyle"> <!-- Java Style Guide: Annotations -->
+            <property name="trailingArrayComma" value="ignore"/>
+        </module>
         <module name="ArrayTypeStyle"/> <!-- Java Style Guide: No C-style array declarations -->
         <module name="AvoidEscapedUnicodeCharacters"> <!-- Java Style Guide: Non-ASCII characters -->
             <property name="allowEscapesForControlCharacters" value="true"/>
diff --git a/assertj-refaster-rules/baseline-class-uniqueness.lock b/assertj-refaster-rules/baseline-class-uniqueness.lock
index 99876fc8..202bc8f3 100644
--- a/assertj-refaster-rules/baseline-class-uniqueness.lock
+++ b/assertj-refaster-rules/baseline-class-uniqueness.lock
@@ -2,17 +2,17 @@
 # Run ./gradlew checkClassUniqueness --write-locks to update this file
 
 ## runtimeClasspath
-[com.google.auto.service:auto-service-annotations, com.google.errorprone:error_prone_core, com.google.errorprone:error_prone_refaster]
+[com.google.auto.service:auto-service-annotations, com.google.errorprone:error_prone_refaster]
   - com.google.auto.service.AutoService
-[com.google.auto.value:auto-value-annotations, com.google.errorprone:error_prone_core, com.google.errorprone:error_prone_refaster]
+[com.google.auto.value:auto-value-annotations, com.google.errorprone:error_prone_refaster]
   - com.google.auto.value.extension.memoized.Memoized
-[com.google.code.findbugs:jsr305, com.google.errorprone:error_prone_core, com.google.errorprone:error_prone_refaster]
+[com.google.code.findbugs:jsr305, com.google.errorprone:error_prone_refaster]
   - javax.annotation.MatchesPattern$Checker
   - javax.annotation.Nonnegative$Checker
   - javax.annotation.Nonnull$Checker
   - javax.annotation.RegEx$Checker
   - javax.annotation.meta.When
-[com.google.errorprone:error_prone_core, com.google.errorprone:error_prone_refaster, com.google.guava:guava]
+[com.google.errorprone:error_prone_refaster, com.google.guava:guava]
   - com.google.common.base.Ascii
   - com.google.common.base.Converter
   - com.google.common.base.Converter$1
diff --git a/build.gradle b/build.gradle
index 7833a45b..868ab602 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.4.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:0.16.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.22.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.25.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.0.0'
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.2.0'
     }