HBASE-16955 Fixup precommit protoc check to do new distributed protos and pb 3.1.0 build

This commit is contained in:
Michael Stack 2016-11-08 12:49:00 -08:00
parent 52241c90e4
commit c3b98b87fb
2 changed files with 5 additions and 2 deletions

View File

@ -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

View File

@ -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