commit c3b98b87fb22bbb94c820edcabcb695f176337f2 Author: Michael Stack Date: Tue Nov 8 12:49:00 2016 -0800 HBASE-16955 Fixup precommit protoc check to do new distributed protos and pb 3.1.0 build 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 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 @@ - generate-shaded-classes + compile-protobuf ${project.build.directory}/protoc-generated-sources ${project.build.directory}/protoc-generated-classes