Repository: hbase Updated Branches: refs/heads/master 52241c90e -> c3b98b87f
HBASE-16955 Fixup precommit protoc check to do new distributed protos and pb 3.1.0 build Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c3b98b87 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c3b98b87 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c3b98b87 Branch: refs/heads/master Commit: c3b98b87fb22bbb94c820edcabcb695f176337f2 Parents: 52241c9 Author: Michael Stack <[email protected]> Authored: Tue Nov 8 12:49:00 2016 -0800 Committer: Michael Stack <[email protected]> Committed: Tue Nov 8 12:49:12 2016 -0800 ---------------------------------------------------------------------- dev-support/hbase-personality.sh | 5 ++++- hbase-protocol-shaded/pom.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c3b98b87/dev-support/hbase-personality.sh ---------------------------------------------------------------------- diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 83b28a5..de9e80b 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -286,7 +286,10 @@ function hbaseprotoc_rebuild start_clock personality_modules patch hbaseprotoc - modules_workers patch hbaseprotoc compile -DskipTests -Pcompile-protobuf -X -DHBasePatchProcess + # Need to run 'install' instead of 'compile' because shading plugin + # is hooked-up to 'install'; else hbase-protocol-shaded is left with + # half of its process done. + modules_workers patch hbaseprotoc install -DskipTests -Pcompile-protobuf -X -DHBasePatchProcess # shellcheck disable=SC2153 until [[ $i -eq "${#MODULE[@]}" ]]; do http://git-wip-us.apache.org/repos/asf/hbase/blob/c3b98b87/hbase-protocol-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 4626abb..28b442f 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -180,7 +180,7 @@ </property> </activation> <properties> - <profile.id>generate-shaded-classes</profile.id> + <profile.id>compile-protobuf</profile.id> <sources.dir>${project.build.directory}/protoc-generated-sources</sources.dir> <classes.dir>${project.build.directory}/protoc-generated-classes</classes.dir> <!--When the compile for this profile runs, make sure it makes jars that
