You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/01/16 20:36:03 UTC
hbase git commit: HBASE-19739 Include thrift IDL files in
hbase-thrift.jar and .proto files in hbase-protocol-shaded.jar respectively
Repository: hbase
Updated Branches:
refs/heads/branch-2 e60d302b9 -> 20afaca76
HBASE-19739 Include thrift IDL files in hbase-thrift.jar and .proto files in hbase-protocol-shaded.jar respectively
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/20afaca7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/20afaca7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/20afaca7
Branch: refs/heads/branch-2
Commit: 20afaca7697ab0dea64d9355fc492b42759c0cfe
Parents: e60d302
Author: Umesh Agashe <ua...@cloudera.com>
Authored: Wed Jan 10 14:03:30 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Tue Jan 16 12:35:56 2018 -0800
----------------------------------------------------------------------
hbase-protocol-shaded/pom.xml | 8 ++++++++
hbase-thrift/pom.xml | 6 ++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/20afaca7/hbase-protocol-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 1ed4374..14151b0 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -38,6 +38,14 @@
<internal.protobuf.version>3.3.0</internal.protobuf.version>
</properties>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/</directory>
+ <includes>
+ <include>**/*.proto</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/20afaca7/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 00d8dfc..77e8859 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -43,6 +43,12 @@
<include>hbase-webapps/**</include>
</includes>
</resource>
+ <resource>
+ <directory>src/main/resources/</directory>
+ <includes>
+ <include>**/*.thrift</include>
+ </includes>
+ </resource>
</resources>
<testResources>
<testResource>