From f22e39a2896c77eb7a83385030007e4d8a2f0aae Mon Sep 17 00:00:00 2001
From: svc-excavator-bot <svc-excavator-bot@palantir.com>
Date: Fri, 22 Nov 2019 06:22:09 +0000
Subject: [PATCH] Excavator: Upgrades Baseline to the latest version

---
 .../checkstyle/checkstyle-suppressions.xml     | 16 ----------------
 .baseline/checkstyle/checkstyle.xml            | 16 ----------------
 .../idea/intellij-java-palantir-style.xml      | 16 ----------------
 build.gradle                                   |  2 +-
 project/scalastyle_config.xml                  | 18 +-----------------
 5 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
index 47897fef..c0f855b1 100644
--- a/.baseline/checkstyle/checkstyle-suppressions.xml
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0"?>
-<!--
-  ~ (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <!DOCTYPE suppressions PUBLIC
     "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
     "https://checkstyle.org/dtds/suppressions_1_2.dtd">
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 150cdeba..cd19cae4 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0"?>
-<!--
-  ~ (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <!DOCTYPE module PUBLIC
         "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
         "https://checkstyle.org/dtds/configuration_1_3.dtd">
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
index 474bd9bf..9aa48633 100644
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -1,19 +1,3 @@
-<!--
-  ~ (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <project version="4">
   <component name="ProjectCodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS">
diff --git a/build.gradle b/build.gradle
index 4a4ada18..f17a7e9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.34.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.35.2'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
         classpath 'com.palantir.sls-packaging:gradle-sls-packaging:4.3.3'
diff --git a/project/scalastyle_config.xml b/project/scalastyle_config.xml
index e17b410e..8ec09af2 100644
--- a/project/scalastyle_config.xml
+++ b/project/scalastyle_config.xml
@@ -1,19 +1,3 @@
-<!--
-  ~ (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <scalastyle commentFilter="enabled">
     <name>Scalastyle standard configuration</name>
     <check level="error" class="org.scalastyle.file.FileTabChecker" enabled="true"/>
@@ -25,7 +9,7 @@
     <check level="error" class="org.scalastyle.file.HeaderMatchesChecker" enabled="true">
         <parameters>
             <parameter name="regex">true</parameter>
-            <parameter name="header">(?m)^\/\*$\n^ \* \(c\) Copyright \d{4} Palantir Technologies Inc\. All rights reserved\.$\n^ \*</parameter>
+            <parameter name="header">(?m)^\/\*$\n^ \* \(c\) Copyright \d{4} Palantir Technologies Inc\. All rights reserved\.$\n^ \*\/$</parameter>
         </parameters>
     </check>
     <check level="error" class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="true"/>