Skip to content

Commit e4f4eab

Browse files
Excavator: Upgrades Baseline to the latest version (#670)
Co-authored-by: svc-excavator-bot <[email protected]>
1 parent 270dac9 commit e4f4eab

File tree

2 files changed

+12
-31
lines changed

2 files changed

+12
-31
lines changed

.baseline/checkstyle/checkstyle.xml

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
<?xml version="1.0"?>
2-
<!DOCTYPE module PUBLIC
3-
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4-
"https://checkstyle.org/dtds/configuration_1_3.dtd">
5-
6-
<!--
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
72
Palantir Baseline Checkstyle configuration.
83
Authors: Robert Fink, Brian Worth, Merrick Zoubeiri, and many other contributors. Based in part on http://checkstyle.sourceforge.net/google_style.html
94
Please keep checks alphabetized with one exception: "relaxed" checks are grouped together at the bottom for easier disabling.
105
Check-specific comments reference documents internal to Palantir and can be safely ignored or removed.
11-
-->
12-
6+
--><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
137
<module name="Checker">
148
<property name="charset" value="UTF-8"/>
159
<property name="severity" value="error"/>
@@ -81,14 +75,7 @@
8175
</module>
8276
<module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
8377
<module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
84-
<property name="excludes" value="
85-
com.google.common.base.Preconditions.*,
86-
com.palantir.logsafe.Preconditions.*,
87-
java.util.Collections.*,
88-
java.util.stream.Collectors.*,
89-
org.apache.commons.lang3.Validate.*,
90-
org.assertj.core.api.Assertions.*,
91-
org.mockito.Mockito.*"/>
78+
<property name="excludes" value="com.google.common.base.Preconditions.*, com.palantir.logsafe.Preconditions.*, java.util.Collections.*, java.util.stream.Collectors.*, org.apache.commons.lang3.Validate.*, org.assertj.core.api.Assertions.*, org.mockito.Mockito.*"/>
9279
</module>
9380
<module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
9481
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
@@ -138,12 +125,12 @@
138125
<module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
139126
<property name="id" value="BanShadedClasses"/>
140127
<property name="illegalPkgs" value=".*\.(repackaged|shaded|thirdparty)"/>
141-
<property name="regexp" value="true" />
128+
<property name="regexp" value="true"/>
142129
<message key="import.illegal" value="Must not import repackaged classes."/>
143130
</module>
144131
<module name="IllegalImport">
145132
<property name="illegalPkgs" value="^org\.gradle\.(internal|.*\.internal)"/>
146-
<property name="regexp" value="true" />
133+
<property name="regexp" value="true"/>
147134
<message key="import.illegal" value="Do not rely on gradle internal classes as these may change in minor releases - use org.gradle.api versions instead."/>
148135
</module>
149136
<module name="IllegalImport">
@@ -196,7 +183,9 @@
196183
<property name="separated" value="true"/>
197184
<property name="sortStaticImportsAlphabetically" value="true"/>
198185
</module>
186+
199187
<module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used -->
188+
<!-- Java Style Guide: Nonempty blocks: K & R style -->
200189
<module name="MemberName"> <!-- Java Style Guide: Non-constant field names -->
201190
<property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
202191
<message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/>
@@ -237,6 +226,7 @@
237226
<message key="name.invalidPattern" value="Package name ''{0}'' must match pattern ''{1}''."/>
238227
</module>
239228
<module name="ParameterAssignment"/> <!-- Java Coding Guidelines: Final variables and parameters -->
229+
<!-- Java Style Guide: Horizontal whitespace -->
240230
<module name="RedundantImport"/> <!-- Java Style Guide: No unused imports -->
241231
<module name="RedundantModifier"/> <!-- Java Coding Guidelines: Avoid redundant modifiers -->
242232
<module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
@@ -391,7 +381,7 @@
391381
<module name="SuppressWarnings">
392382
<property name="format" value="serial"/>
393383
</module>
394-
<module name="SuppressWarningsHolder" /> <!-- Required for SuppressWarningsFilter -->
384+
<module name="SuppressWarningsHolder"/> <!-- Required for SuppressWarningsFilter -->
395385
<module name="TypeName"> <!-- Java Style Guide: Class names -->
396386
<message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
397387
</module>
@@ -402,16 +392,7 @@
402392
<module name="UpperEll"/> <!-- Java Style Guide: Numeric Literals -->
403393
<module name="VisibilityModifier"/> <!-- Java Coding Guidelines: Minimize mutability -->
404394
<module name="WhitespaceAfter"/> <!-- Java Style Guide: Horizontal whitespace -->
405-
<module name="WhitespaceAround"> <!-- Java Style Guide: Horizontal whitespace -->
406-
<property name="allowEmptyConstructors" value="true"/>
407-
<property name="allowEmptyMethods" value="true"/>
408-
<property name="allowEmptyTypes" value="true"/>
409-
<property name="allowEmptyLoops" value="true"/>
410-
<property name="allowEmptyLambdas" value="true"/>
411-
<property name="ignoreEnhancedForColon" value="false"/>
412-
<message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
413-
<message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
414-
</module>
395+
415396

416397
<!-- Stricter checks begin: delete some or all of the following for faster prototyping, but please restore before pushing to production. -->
417398

@@ -460,4 +441,4 @@
460441

461442
<!-- Stricter checks end -->
462443
</module>
463-
</module>
444+
</module>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ buildscript {
2828
classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
2929
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
3030
classpath 'com.netflix.nebula:nebula-publishing-plugin:17.3.2'
31-
classpath 'com.palantir.baseline:gradle-baseline-java:3.63.0'
31+
classpath 'com.palantir.baseline:gradle-baseline-java:3.63.3'
3232
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
3333
classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0'
3434
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.27.0'

0 commit comments

Comments
 (0)