This is an automated email from the ASF dual-hosted git repository.
nihaljain pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-thirdparty.git
The following commit(s) were added to refs/heads/master by this push:
new 223f4c6 HBASE-29343 Stop versioning protobuf patches in
hbase-thirdparty (#138)
223f4c6 is described below
commit 223f4c6207f2fa217f0f14bb07e6f940ab8d2882
Author: Nihal Jain <[email protected]>
AuthorDate: Wed May 21 15:59:30 2025 +0530
HBASE-29343 Stop versioning protobuf patches in hbase-thirdparty (#138)
* It is not very useful to version the patch files as we already are under
version control via git.
Signed-off-by: Istvan Toth <[email protected]>
---
README.md | 8 ++++----
.../src/main/patches/{HBASE-15789_V4.patch => HBASE-15789.patch} | 0
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index e070c1f..1fa036d 100644
--- a/README.md
+++ b/README.md
@@ -73,16 +73,16 @@ In case build fails due to protobuf-java version change, we
can follow below ste
```
NOTE: Ensure to replace <BASE_DIR_TO_HBASE_THIRDPARTY_CODE> based on your
setup.
5) Resolve any conflicts. Next, stage all changes and commit the change.
-6) Generate a patch from previous commit. Also bump up patch version if there
are code changes.
+6) Generate a patch from previous commit and save the patch file, if there are
code changes/conflict.
```sh
- git diff HEAD^ HEAD > HBASE-15789_V4.patch
+ git diff HEAD^ HEAD > HBASE-15789.patch
```
7) Trim the prefix directory 'java/core' from the generated patch.
```sh
- sed -i '' 's|java/core/src/main/java/|src/main/java/|g'
HBASE-15789_V4.patch
+ sed -i '' 's|java/core/src/main/java/|src/main/java/|g' HBASE-15789.patch
```
8) Repeat steps 4 to 7 for each patch.
-9) Copy updated patches to 'hbase-shaded-protobuf/src/main/patches' in case
there was any code conflict. Drop corresponding stale patches.
+9) Copy and overwrite old patches at 'hbase-shaded-protobuf/src/main/patches'
with the updated patches, in case there was any code changes/conflict.
---
diff --git a/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V4.patch
b/hbase-shaded-protobuf/src/main/patches/HBASE-15789.patch
similarity index 100%
rename from hbase-shaded-protobuf/src/main/patches/HBASE-15789_V4.patch
rename to hbase-shaded-protobuf/src/main/patches/HBASE-15789.patch
