From 523aa7a7fe7790ad4b6752f0fbe76eb0671acd33 Mon Sep 17 00:00:00 2001 From: Apekshit Sharma Date: Fri, 12 Jan 2018 15:06:08 -0800 Subject: [PATCH] HBASE-19780 Change execution phase of checkstyle plugin back to default 'verify' --- hbase-annotations/pom.xml | 15 ++------ hbase-archetypes/pom.xml | 15 ++------ hbase-build-support/hbase-error-prone/pom.xml | 15 ++------ hbase-external-blockcache/pom.xml | 15 ++------ hbase-hadoop-compat/pom.xml | 14 ++------ hbase-metrics-api/pom.xml | 15 ++------ hbase-metrics/pom.xml | 15 ++------ hbase-protocol-shaded/pom.xml | 51 +++++++++++---------------- hbase-protocol/pom.xml | 15 ++------ hbase-replication/pom.xml | 15 ++------ hbase-rsgroup/pom.xml | 15 ++------ hbase-spark-it/pom.xml | 15 ++------ hbase-spark/pom.xml | 15 ++------ hbase-thrift/pom.xml | 15 ++------ pom.xml | 26 +++----------- 15 files changed, 64 insertions(+), 207 deletions(-) diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml index 86eb313afb..94c506b99c 100644 --- a/hbase-annotations/pom.xml +++ b/hbase-annotations/pom.xml @@ -36,18 +36,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-archetypes/pom.xml b/hbase-archetypes/pom.xml index 58ac89a74d..f33a2161d3 100644 --- a/hbase-archetypes/pom.xml +++ b/hbase-archetypes/pom.xml @@ -81,18 +81,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-build-support/hbase-error-prone/pom.xml b/hbase-build-support/hbase-error-prone/pom.xml index b90d73312f..343bb3e273 100644 --- a/hbase-build-support/hbase-error-prone/pom.xml +++ b/hbase-build-support/hbase-error-prone/pom.xml @@ -71,18 +71,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index 8b048c5c6f..ce79e1abff 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -98,18 +98,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml index 512a4666f8..af0cd10528 100644 --- a/hbase-hadoop-compat/pom.xml +++ b/hbase-hadoop-compat/pom.xml @@ -59,17 +59,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - + + true + diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml index f2a89af6b8..49098de520 100644 --- a/hbase-metrics-api/pom.xml +++ b/hbase-metrics-api/pom.xml @@ -71,18 +71,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-metrics/pom.xml b/hbase-metrics/pom.xml index b3ba39dc3b..869020d4b9 100644 --- a/hbase-metrics/pom.xml +++ b/hbase-metrics/pom.xml @@ -71,18 +71,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 03030b82cc..ccc62f808a 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -50,7 +50,7 @@ org.apache.maven.plugins maven-source-plugin - + maven-assembly-plugin @@ -100,26 +100,26 @@ we run mvn install. There is probably a better way of avoiding the double interpolation but this is it for now. --> - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + generate-sources - + replace - - - - - ${basedir}/target/generated-sources/ - - **/*.java - + + + + + ${basedir}/target/generated-sources/ + + **/*.java + - ([^\.])com.google.protobuf + ([^\.])com.google.protobuf $1org.apache.hbase.thirdparty.com.google.protobuf @@ -132,7 +132,7 @@ $1 - + org.apache.maven.plugins @@ -182,18 +182,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml index ec7f66a97f..57c789cf3e 100644 --- a/hbase-protocol/pom.xml +++ b/hbase-protocol/pom.xml @@ -115,18 +115,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml index f44db12a37..6bcbf8da19 100644 --- a/hbase-replication/pom.xml +++ b/hbase-replication/pom.xml @@ -72,18 +72,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index 16c198b69a..0cde4c7ad6 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -71,18 +71,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-spark-it/pom.xml b/hbase-spark-it/pom.xml index ff6581fb07..d1bab94737 100644 --- a/hbase-spark-it/pom.xml +++ b/hbase-spark-it/pom.xml @@ -181,18 +181,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index 4554446b7a..a3a41fd79b 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -709,18 +709,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 891676a7ce..2f6e8e8427 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -142,18 +142,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/pom.xml b/pom.xml index bbfb12204e..b4a9e746be 100755 --- a/pom.xml +++ b/pom.xml @@ -941,6 +941,9 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${maven.checkstyle.version} @@ -1178,23 +1181,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - org.apache.hbase - hbase-checkstyle - ${project.version} - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - - hbase/checkstyle.xml - hbase/checkstyle-suppressions.xml - true - org.apache.maven.plugins @@ -1547,7 +1533,7 @@ Default is the build start timestamp. Up on jenkins pass in the jenkins build id by setting this parameter by invoking mvn with -Dbuild.id=$BUILD_ID--> ${maven.build.timestamp} - + @@ -3648,12 +3634,8 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${maven.checkstyle.version} target/** - hbase/checkstyle.xml - hbase/checkstyle-suppressions.xml - true -- 2.14.1