Excavator: Upgrades Baseline to the latest version

palantir · Apr 2, 2020 · 10b58b8 · 10b58b8
1 parent b86adb5
commit 10b58b8
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 11 deletions.
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
@@ -18,15 +18,6 @@
     <module name="NewlineAtEndOfFile"> <!-- Java Style Guide: Line ending: LF -->
         <property name="lineSeparator" value="lf"/>
     </module>
-    <module name="RegexpHeader">
-        <property name="header" value="^/\*$\n^ \* \(c\) Copyright \d{4} Palantir Technologies Inc\. All rights reserved\.$"/>
-        <property name="fileExtensions" value=".java,.ts"/>
-    </module>
-    <module name="RegexpMultiline"> <!-- Development Practices: Writing good unit tests -->
-        <property name="fileExtensions" value="java"/>
-        <property name="format" value="@VisibleForTesting\s+(protected|public)"/>
-        <property name="message" value="@VisibleForTesting members should be package-private."/>
-    </module>
     <module name="RegexpSingleline"> <!-- No reference needed as this is evident. -->
         <property name="format" value="&lt;&lt;&lt;&lt;&lt;&lt;&lt;"/>
         <property name="message" value="Found (&lt;&lt;&lt;&lt;&lt;&lt;&lt;), so it looks like you had a merge conflict that compiles. Please fix it."/>
@@ -410,7 +401,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
@@ -29,7 +29,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:7.1.3'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:17.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.49.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:3.10.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.23.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
     }

diff --git a/...ases-internal/src/main/java/com/palantir/conjure/verification/GenerateClientServices.java b/...ases-internal/src/main/java/com/palantir/conjure/verification/GenerateClientServices.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2018 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.
  */
 
 package com.palantir.conjure.verification;

diff --git a/...ases-internal/src/main/java/com/palantir/conjure/verification/GenerateServerServices.java b/...ases-internal/src/main/java/com/palantir/conjure/verification/GenerateServerServices.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2018 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.
  */
 
 package com.palantir.conjure.verification;

diff --git a/...java/com/palantir/conjure/verification/server/CompileVerificationServerTestCasesJson.java b/...java/com/palantir/conjure/verification/server/CompileVerificationServerTestCasesJson.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2018 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.
  */
 
 package com.palantir.conjure.verification.server;