From de5d28038baf762655f82d84b8ffb3216638f0c5 Mon Sep 17 00:00:00 2001
From: svc-excavator-bot <svc-excavator-bot@palantir.com>
Date: Thu, 24 Jun 2021 16:29:37 +0000
Subject: [PATCH] Excavator: Upgrades Baseline to the latest version

---
 .baseline/checkstyle/checkstyle.xml             |  4 ++--
 .baseline/idea/intellij-java-palantir-style.xml | 12 ++++++++++++
 build.gradle                                    |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 7e155ea5d..494192ad9 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -342,7 +342,7 @@
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\bCharset.defaultCharset\("/>
-            <property name="message" value="Use explicit charset (e.g. StandardCharsets.UTF-8) instead of default."/>
+            <property name="message" value="Use explicit charset (e.g. StandardCharsets.UTF_8) instead of default."/>
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\bIOUtils\.toString\("/>
@@ -405,7 +405,7 @@
             <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"/>
+            <property name="accessModifiers" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
index 945d8bad0..f41e2b8aa 100644
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -44,6 +44,18 @@
               <package name="" withSubpackages="true" static="false" />
             </value>
           </option>
+          <DO_NOT_IMPORT_INNER>
+            <CLASS name="Builder" />
+            <CLASS name="Callback" />
+            <CLASS name="Class" />
+            <CLASS name="Entry" />
+            <CLASS name="Enum" />
+            <CLASS name="Factory" />
+            <CLASS name="Type" />
+            <CLASS name="Key" />
+            <CLASS name="Id" />
+            <CLASS name="Provider" />
+          </DO_NOT_IMPORT_INNER>
         </GroovyCodeStyleSettings>
         <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
         <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
diff --git a/build.gradle b/build.gradle
index 41659e843..8d48a86d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.0.1'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.4.4'
         classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:3.65.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:3.95.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.30.0'