This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 65304ba216f [fix](code-style) Adapt to checkstyle and spotless (#26488)
65304ba216f is described below
commit 65304ba216fcdd9a3a4e1300981d3f8889d51732
Author: Guangdong Liu <liug...@gmail.com>
AuthorDate: Tue Nov 7 00:23:39 2023 +0800
[fix](code-style) Adapt to checkstyle and spotless (#26488)
---
fe/check/checkstyle/checkstyle.xml | 16 +---------------
fe/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/fe/check/checkstyle/checkstyle.xml
b/fe/check/checkstyle/checkstyle.xml
index d2592122b7b..34cce78e4f6 100644
--- a/fe/check/checkstyle/checkstyle.xml
+++ b/fe/check/checkstyle/checkstyle.xml
@@ -44,7 +44,7 @@ under the License.
</module>
<module name="LineLength">
<property name="fileExtensions" value="java"/>
- <property name="max" value="120"/>
+ <property name="max" value="150"/>
<property name="ignorePattern" value="^package.*|^import.*|a
href|href|http://|https://|ftp://"/>
</module>
<module name="NewlineAtEndOfFile">
@@ -93,14 +93,6 @@ under the License.
<property name="tokens"
value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR,
LITERAL_IF, LITERAL_WHILE"/>
</module>
- <module name="LeftCurly">
- <property name="tokens"
- value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF,
ENUM_CONSTANT_DEF, ENUM_DEF,
- INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH,
LITERAL_DEFAULT,
- LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR,
LITERAL_IF,
- LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY,
LITERAL_WHILE, METHOD_DEF,
- OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
- </module>
<module name="RightCurly">
<property name="id" value="RightCurlySame"/>
<property name="tokens"
@@ -148,12 +140,6 @@ under the License.
<!-- Imports -->
<module name="AvoidStarImport"/>
<module name="AvoidStaticImport"/>
- <module name="CustomImportOrder">
- <property name="sortImportsInGroupAlphabetically" value="true"/>
- <property name="separateLineBetweenGroups" value="true"/>
- <property name="customImportOrderRules"
value="SAME_PACKAGE(3)###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
- <property name="tokens" value="IMPORT, STATIC_IMPORT,
PACKAGE_DEF"/>
- </module>
<module name="ImportControl">
<property name="file" value="check/checkstyle/import-control.xml"/>
</module>
diff --git a/fe/pom.xml b/fe/pom.xml
index 3003d642621..65948564af3 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -1440,7 +1440,7 @@ under the License.
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
- <version>2.22.8</version>
+ <version>2.29.0</version>
<configuration>
<ratchetFrom>origin/master</ratchetFrom>
<java>
@@ -1455,7 +1455,7 @@ under the License.
<removeUnusedImports />
<trimTrailingWhitespace />
<importOrder>
-
<order>org.apache.doris,org.apache,org,com,java|javax,,</order>
+
<order>org.apache.doris,org.apache,org,,javax,java,\#</order>
</importOrder>
</java>
<pom>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
