From 8ac84a7f1de77f288a5432dbe53c05a2c7d7915b Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Tue, 26 Apr 2022 21:40:08 +0800 Subject: [PATCH] HBASE-26899 tweak pom and formatter Signed-off-by: Andrew Purtell Signed-off-by: Nick Dimiduk (cherry picked from commit 0edecbf9e00fa33ff163af2b7098873e0c84a34e) --- dev-support/hbase_eclipse_formatter.xml | 690 ++++++++++++++---------- pom.xml | 46 +- 2 files changed, 439 insertions(+), 297 deletions(-) diff --git a/dev-support/hbase_eclipse_formatter.xml b/dev-support/hbase_eclipse_formatter.xml index 6dec653ad62..99000a62e21 100644 --- a/dev-support/hbase_eclipse_formatter.xml +++ b/dev-support/hbase_eclipse_formatter.xml @@ -18,297 +18,401 @@ * limitations under the License. */ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 4ea0c6037f4..56685416c3b 100644 --- a/pom.xml +++ b/pom.xml @@ -628,7 +628,8 @@ 3.0.0-M6 2.12 1.0.1 - 2.21.0 + 2.22.2 + 3.11.0 0.21 1.7.1 @@ -2283,6 +2284,7 @@ org.apache.maven.plugins maven-site-plugin + ${maven-site.version} ${basedir}/src/site ${basedir}/src/site/custom/project-info-report.properties @@ -2374,10 +2376,25 @@ spotless-maven-plugin ${spotless.version} - - 245229055edd7727fc287c9683365cbac02b64ee + + **/generated/* + **/package-info.java + + + + Remove unhelpful javadoc stubs + (?m)^ *\* *@(?:param|throws|return) *\w* *\n + + \n + ${session.executionRootDirectory}/dev-support/hbase_eclipse_formatter.xml @@ -2385,19 +2402,40 @@ ${session.executionRootDirectory}/dev-support/eclipse.importorder + + ${session.executionRootDirectory}/dev-support/license-header + false - + + + + + + **/*.xml + **/*.sh + **/*.py + **/Jenkinsfile* + **/*.md + *.md + **/*.txt + *.txt + + + + + +