From a5e603ebfd230ef970e71be38e2ba784b0b916d1 Mon Sep 17 00:00:00 2001 From: Nihal Jain Date: Tue, 20 May 2025 23:17:31 +0530 Subject: [PATCH] HBASE-29343 Stop versioning protobuf patches in hbase-thirdparty --- README.md | 8 ++++---- .../patches/{HBASE-15789_V4.patch => HBASE-15789.patch} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename hbase-shaded-protobuf/src/main/patches/{HBASE-15789_V4.patch => HBASE-15789.patch} (100%) 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 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