From 6ed867b081e5499d0a4188b49bb95f228da073ab Mon Sep 17 00:00:00 2001 From: stack Date: Sat, 30 Mar 2019 11:21:00 -0700 Subject: [PATCH] HBASE-18709 Clean out bundled proto files --- README.txt | 11 ++++++++++- hbase-shaded-protobuf/pom.xml | 23 +++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/README.txt b/README.txt index 0023433..2576d04 100644 --- a/README.txt +++ b/README.txt @@ -21,7 +21,13 @@ See the pom.xml for the explicit version of each third-party lib included. Note that in hbase-shaded-protobuf, we unzip the protobuf jar to src/main/java rather than to a dir under target because the jar plugin wants src here (its -hard to convince it otherwise). +hard to convince it otherwise). We also apply some patches. Current set are: + + HBASE-15789_V2.patch + HBASE-17087.patch + HBASE-17239.patch + +Ideally we would be pushing this set up into protobuf project. To build, just run: @@ -37,3 +43,6 @@ To build a src tarball: (Make sure you have your credentials set over in ~/.m2/settings.xml, etc. -- see hbase refguide for publishing SNAPSHOTS/Release Candidates) + +There is no CHANGES.md just yet as this project does not have its own +dedicated JIRA or JIRA label for filing issues against. TODO. diff --git a/hbase-shaded-protobuf/pom.xml b/hbase-shaded-protobuf/pom.xml index c0dddd0..7729181 100644 --- a/hbase-shaded-protobuf/pom.xml +++ b/hbase-shaded-protobuf/pom.xml @@ -63,12 +63,6 @@ false - - ${basedir} - - dependency-reduced-pom.xml - - @@ -168,7 +162,24 @@ com.google.errorprone.annotations.CanIgnoreReturnValue + + google.protobuf + ${rename.offset}.google.protobuf + + com.google.errorprone.annotations.CanIgnoreReturnValue + + + + **/*.proto + + + + + + com.google.*:* + + -- 2.19.1