This is an automated email from the ASF dual-hosted git repository.
ztang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 6528f53 Fix conflicts of java indentation between .editorconfig and
mvn plugin
6528f53 is described below
commit 6528f53ea5e84a932024ca574030f8f81051d40e
Author: Zhankun Tang <[email protected]>
AuthorDate: Mon Mar 16 09:43:54 2020 +0800
Fix conflicts of java indentation between .editorconfig and mvn plugin
### What is this PR for?
The ".editorconfig" enforced all the java indent size to 2 which will cause
conflicts when maven check-style plugin does checking. We could remove this
configuration from ".editorconfig".
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-429
### How should this be tested?
Manually tested.
With this fix, the indent size in IDE like Intellij won't always be 2 and
won't fail the mvn package.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Zhankun Tang <[email protected]>
Closes #228 from tangzhankun/SUBMARINE-429 and squashes the following
commits:
6b92d32 [Zhankun Tang] Fix conflicts of java indentation between
.editorconfig and mvn checkstyle plugin
---
.editorconfig | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.editorconfig b/.editorconfig
index 59e9dc4..5bda827 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,7 +14,7 @@ trim_trailing_whitespace = true
indent_style = tab
# 2 space indentation
-[*.{java,sh,json,xml}]
+[*.{sh,json,xml}]
indent_style = space
indent_size = 2
@@ -23,5 +23,7 @@ indent_size = 2
indent_style = space
indent_size = 4
+# Don't enforce indent size for java. maven check-style will handle other
styles
[*.java]
+indent_style = space
max_line_length = 100
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
