HBASE-16949 Fix RAT License complaint about the hbase-protocol-shaded/src/main/patches content

This commit is contained in:
Michael Stack 2016-10-26 14:52:47 -07:00
parent cd3dd6e018
commit c776b3144d
3 changed files with 14 additions and 5 deletions

View File

@ -33,7 +33,10 @@ your $PATH as in:
$ export PATH=~/bin/protobuf-3.1.0/src:$PATH $ export PATH=~/bin/protobuf-3.1.0/src:$PATH
.. or pass -Dprotoc.path=PATH_TO_PROTOC when running .. 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. build protoc first.
Run: Run:
@ -44,10 +47,9 @@ or
$ mvn install -Pcompille-protobuf $ mvn install -Pcompille-protobuf
to build and trigger the special generate-shaded-classes to build and trigger the special generate-shaded-classes profile.
profile. When finished, the content of When finished, the content of src/main/java/org/apache/hadoop/hbase/shaded
src/main/java/org/apache/hadoop/hbase/shaded will have will have been updated. Make sure all builds and then carefully
been updated. Make sure all builds and then carefully
check in the changes. Files may have been added or removed check in the changes. Files may have been added or removed
by the steps above. by the steps above.

View File

@ -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. 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. 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 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). on a JIRA with your definition file changes and the generated files).

View File

@ -797,6 +797,7 @@
<exclude>**/rat.txt</exclude> <exclude>**/rat.txt</exclude>
<!-- exclude the shaded protobuf files --> <!-- exclude the shaded protobuf files -->
<exclude>**/shaded/com/google/protobuf/**</exclude> <exclude>**/shaded/com/google/protobuf/**</exclude>
<exclude>**/src/main/patches/**</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>