diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 5d8bc6ef7..eb9374963 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -406,7 +406,6 @@
             <message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="TypecastParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
-        <module name="UnnecessaryParentheses"/>
         <module name="UnusedImports"> <!-- Java Style Guide: No unused imports -->
             <property name="processJavadoc" value="true"/>
         </module>
diff --git a/build.gradle b/build.gradle
index 5663e8241..b8a869a69 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.49.1'
+        classpath 'com.palantir.baseline:gradle-baseline-java:3.1.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.16.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0'
diff --git a/gradle.properties b/gradle.properties
index ab1619a52..7a0ad515d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,3 @@
 systemProp.org.gradle.internal.http.socketTimeout=600000
 systemProp.org.gradle.internal.http.connectionTimeout=600000
 org.gradle.parallel=true
-com.palantir.baseline-versions.disable=true