From commits-return-66031-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Wed Jan 24 00:33:00 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 2075D180621 for ; Wed, 24 Jan 2018 00:33:00 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 100F1160C4D; Tue, 23 Jan 2018 23:33:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 08970160C3A for ; Wed, 24 Jan 2018 00:32:58 +0100 (CET) Received: (qmail 2745 invoked by uid 500); 23 Jan 2018 23:32:58 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 2736 invoked by uid 99); 23 Jan 2018 23:32:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jan 2018 23:32:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 107C0E2F03; Tue, 23 Jan 2018 23:32:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: appy@apache.org To: commits@hbase.apache.org Message-Id: <9d54d4774fd04647b0fb9efb61e75244@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-19780 Fix build in branch-2 - change execution phase of checkstyle plugin back to default 'verify' Date: Tue, 23 Jan 2018 23:32:58 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-2 8977aae43 -> b0b2d12d9 HBASE-19780 Fix build in branch-2 - change execution phase of checkstyle plugin back to default 'verify' Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b0b2d12d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b0b2d12d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b0b2d12d Branch: refs/heads/branch-2 Commit: b0b2d12d9d434795a19167303dd3310ecd4b32a7 Parents: 8977aae Author: Apekshit Sharma Authored: Fri Jan 12 15:06:08 2018 -0800 Committer: Apekshit Sharma Committed: Tue Jan 23 15:28:37 2018 -0800 ---------------------------------------------------------------------- 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-metrics-api/pom.xml | 15 ++----- hbase-metrics/pom.xml | 15 ++----- hbase-protocol-shaded/pom.xml | 51 +++++++++------------- pom.xml | 26 ++--------- 8 files changed, 43 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml index 6ad3c12..8e73769 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 + http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-archetypes/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-archetypes/pom.xml b/hbase-archetypes/pom.xml index bc96c27..8f755f0 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 + http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-build-support/hbase-error-prone/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-build-support/hbase-error-prone/pom.xml b/hbase-build-support/hbase-error-prone/pom.xml index 00dad96..b9e5e1e 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 + http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-external-blockcache/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index e9d4e60..4de7f34 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 + http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-metrics-api/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml index 0327204..3389f7e 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 + http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-metrics/pom.xml b/hbase-metrics/pom.xml index 39b8cc8..3abca83 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 + http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/hbase-protocol-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 14151b0..c3b3916 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 + http://git-wip-us.apache.org/repos/asf/hbase/blob/b0b2d12d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a06cad7..4329d5a 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