Skip to content

Commit ac9c61a

Browse files
Excavator: Upgrades Baseline to the latest version (apache-spark-on-k8s#484)
###### _excavator_ is a bot for automating changes across repositories. Changes produced by the roomba/latest-baseline-oss check. {runtimeCheckDesc} To enable or disable this check, please contact the maintainers of Excavator.
1 parent 40b7aff commit ac9c61a

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.baseline/checkstyle/checkstyle.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<property name="lineSeparator" value="lf"/>
2020
</module>
2121
<module name="Header">
22-
<!--<property name="header" value="^/\*$\n^ \* Licensed to the Apache Software Foundation (ASF) under one or more$\n"/>-->
2322
<property name="headerFile" value="${config_loc}/header.txt"/>
2423
<property name="fileExtensions" value=".java,.ts"/>
2524
</module>
@@ -41,13 +40,18 @@
4140
<property name="message" value="Whitespace at end-of-line"/>
4241
</module>
4342
<module name="RegexpMultiline"> <!-- Java Style Guide: Vertical Whitespace -->
44-
<property name="fileExtensions" value="java"/>
43+
<property name="fileExtensions" value="java"/>
4544
<property name="format" value="^\n\n$"/>
4645
<property name="message" value="Two consecutive blank lines are not permitted."/>
4746
</module>
4847
<module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
4948
<property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
5049
</module>
50+
<module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
51+
<!-- custom-suppressions.xml allows users to specify suppresions that will not be overriden by baselineUpdateConfig -->
52+
<property name="file" value="${config_loc}/custom-suppressions.xml"/>
53+
<property name="optional" value="true"/>
54+
</module>
5155
<module name="SuppressWarningsFilter"/> <!-- baseline-gradle: README.md -->
5256
<module name="TreeWalker">
5357
<module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
@@ -128,6 +132,7 @@
128132
<message key="import.illegal" value="Must not import repackaged classes."/>
129133
</module>
130134
<module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
135+
<property name="id" value="BanShadedClasses"/>
131136
<property name="illegalPkgs" value=".*\.(repackaged|shaded|thirdparty)"/>
132137
<property name="regexp" value="true" />
133138
<message key="import.illegal" value="Must not import repackaged classes."/>

.baseline/idea/intellij-java-palantir-style.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,14 @@
116116
<option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
117117
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
118118
<option name="RESOURCE_LIST_WRAP" value="5" />
119+
<option name="RIGHT_MARGIN" value="120" />
119120
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
120121
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
121122
<option name="TERNARY_OPERATION_WRAP" value="5" />
122123
<option name="THROWS_KEYWORD_WRAP" value="1" />
123124
<option name="THROWS_LIST_WRAP" value="1" />
124125
<option name="WHILE_BRACE_FORCE" value="3" />
126+
<option name="WRAP_ON_TYPING" value="1" />
125127
<arrangement>
126128
<rules>
127129
<section>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ buildscript {
2323
}
2424

2525
dependencies {
26-
classpath 'com.palantir.baseline:gradle-baseline-java:0.41.0'
26+
classpath 'com.palantir.baseline:gradle-baseline-java:0.49.1'
2727
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.11.0'
2828
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
2929
classpath 'com.netflix.nebula:nebula-publishing-plugin:9.5.0'

0 commit comments

Comments
 (0)