diff --git a/hbase-protocol-shaded/README.txt b/hbase-protocol-shaded/README.txt index cbd0eea..b009643 100644 --- a/hbase-protocol-shaded/README.txt +++ b/hbase-protocol-shaded/README.txt @@ -33,7 +33,10 @@ your $PATH as in: $ export PATH=~/bin/protobuf-3.1.0/src:$PATH .. or pass -Dprotoc.path=PATH_TO_PROTOC when running -the below mvn commands. You may need to download protobuf and +the below mvn commands. NOTE: The protoc that we use internally +is very likely NOT what is used over in the hbase-protocol +module (here we'd use a 3.1.0 where in hbase-protocol we'll +use something older, a 2.5.0). You may need to download protobuf and build protoc first. Run: @@ -44,10 +47,9 @@ or $ mvn install -Pcompille-protobuf -to build and trigger the special generate-shaded-classes -profile. When finished, the content of -src/main/java/org/apache/hadoop/hbase/shaded will have -been updated. Make sure all builds and then carefully +to build and trigger the special generate-shaded-classes profile. +When finished, the content of src/main/java/org/apache/hadoop/hbase/shaded +will have been updated. Make sure all builds and then carefully check in the changes. Files may have been added or removed by the steps above. diff --git a/hbase-protocol/README.txt b/hbase-protocol/README.txt index dd88fa0..a3e11a2 100644 --- a/hbase-protocol/README.txt +++ b/hbase-protocol/README.txt @@ -30,5 +30,11 @@ mvn compile -Dcompile-protobuf -Dprotoc.path=/opt/local/bin/protoc If you have added a new proto file, you should add it to the pom.xml file first. Other modules also support the maven profile. +NOTE: The protoc used here is probably NOT the same as the hbase-protocol-shaded +module uses; here we use a more palatable version -- 2.5.0 -- wherease over in +the internal hbase-protocol-shaded module, we'd use something newer. Be conscious +of this when running your protoc being sure to apply the appropriate version +per module. + After you've done the above, check it in and then check it in (or post a patch on a JIRA with your definition file changes and the generated files). diff --git a/pom.xml b/pom.xml index e08f64e..ad77f05 100644 --- a/pom.xml +++ b/pom.xml @@ -797,6 +797,7 @@ **/rat.txt **/shaded/com/google/protobuf/** + **/src/main/patches/**