diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml index 6ad3c125753..8e73769422e 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 bc96c272f72..8f755f04f1b 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 00dad960588..b9e5e1e9b5a 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 e9d4e60497b..4de7f341a4f 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-metrics-api/pom.xml b/hbase-metrics-api/pom.xml index 0327204d17a..3389f7e9f27 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 39b8cc81b70..3abca8300ab 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 14151b0e805..c3b3916892f 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -58,7 +58,7 @@ org.apache.maven.plugins maven-source-plugin - + maven-assembly-plugin @@ -108,30 +108,30 @@ 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 - + org.apache.maven.plugins @@ -181,18 +181,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - - - checkstyle - validate - - check - - - true - - - + + true + diff --git a/pom.xml b/pom.xml index a06cad741ee..4329d5a6d22 100755 --- a/pom.xml +++ b/pom.xml @@ -878,6 +878,9 @@ + org.apache.maven.plugins maven-checkstyle-plugin ${maven.checkstyle.version} @@ -1083,23 +1086,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 @@ -1452,7 +1438,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} - + @@ -3558,12 +3544,8 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${maven.checkstyle.version} target/** - hbase/checkstyle.xml - hbase/checkstyle-suppressions.xml - true