Repository: hbase Updated Branches: refs/heads/master 4d1bff9e7 -> 8847a7090
HBASE-17082 ForeignExceptionUtil isnt packaged when building shaded protocol with -Pcompile-protobuf; Attempted Fix Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8847a709 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8847a709 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8847a709 Branch: refs/heads/master Commit: 8847a7090260038afd538de274378a691ca96c4f Parents: 4d1bff9 Author: Michael Stack <[email protected]> Authored: Tue Nov 15 12:22:51 2016 -0800 Committer: Michael Stack <[email protected]> Committed: Tue Nov 15 12:22:51 2016 -0800 ---------------------------------------------------------------------- hbase-protocol-shaded/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8847a709/hbase-protocol-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 2b221d5..aebef81 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -181,7 +181,8 @@ </activation> <properties> <profile.id>compile-protobuf</profile.id> - <sources.dir>${project.build.directory}/protoc-generated-sources</sources.dir> + <!--Include original and the generated protos dir when talking of sources--> + <sources.dir>${basedir}/src/main/java ${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 can be related back to this shading profile. Give them a shading prefix.
