You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/11/29 08:16:39 UTC
[hbase-thirdparty] branch master updated: HBASE-26500 [hbase-thirdparty] Bump protobuf version to 3.19.1 (#58)
This is an automated email from the ASF dual-hosted git repository.
zhangduo 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 68b5959 HBASE-26500 [hbase-thirdparty] Bump protobuf version to 3.19.1 (#58)
68b5959 is described below
commit 68b59596c226943d6a3cdbe9e183b3c723c119c4
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Nov 29 16:16:32 2021 +0800
HBASE-26500 [hbase-thirdparty] Bump protobuf version to 3.19.1 (#58)
Signed-off-by: Yulin Niu <ni...@apache.org>
---
.../src/main/patches/HBASE-15789_V2.patch | 17 +++++++++--------
.../src/main/patches/HBASE-17239.patch | 4 ++--
pom.xml | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch b/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
index 5cddf90..30a165b 100644
--- a/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
+++ b/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
@@ -359,10 +359,10 @@ index 000000000..320977290
+ }
+}
diff --git a/src/main/java/com/google/protobuf/ByteString.java b/src/main/java/com/google/protobuf/ByteString.java
-index e5454a63d..697a8aee7 100644
+index a4beaeb4c..090430346 100644
--- a/src/main/java/com/google/protobuf/ByteString.java
+++ b/src/main/java/com/google/protobuf/ByteString.java
-@@ -373,6 +373,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
+@@ -383,6 +383,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
}
}
@@ -377,13 +377,14 @@ index e5454a63d..697a8aee7 100644
* Wraps the given bytes into a {@code ByteString}. Intended for internal only usage to force a
* classload of ByteString before LiteralByteString.
diff --git a/src/main/java/com/google/protobuf/CodedInputStream.java b/src/main/java/com/google/protobuf/CodedInputStream.java
-index 87c683725..598c6929b 100644
+index 6e9c0f620..bcd5639e8 100644
--- a/src/main/java/com/google/protobuf/CodedInputStream.java
+++ b/src/main/java/com/google/protobuf/CodedInputStream.java
-@@ -194,6 +194,15 @@ public abstract class CodedInputStream {
- return newInstance(buffer, 0, buffer.length, true);
+@@ -200,6 +200,16 @@ public abstract class CodedInputStream {
+ throw InvalidProtocolBufferException.recursionLimitExceeded();
+ }
}
-
++
+ /** Create a new CodedInputStream wrapping the given {@link ByteInput}. */
+ public static CodedInputStream newInstance(ByteInput buf, boolean bufferIsImmutable) {
+ return new ByteInputDecoder(buf, bufferIsImmutable);
@@ -396,7 +397,7 @@ index 87c683725..598c6929b 100644
/** Disable construction/inheritance outside of this class. */
private CodedInputStream() {}
-@@ -3919,4 +3928,652 @@ public abstract class CodedInputStream {
+@@ -3979,4 +3989,652 @@ public abstract class CodedInputStream {
}
}
}
@@ -1050,7 +1051,7 @@ index 87c683725..598c6929b 100644
+ }
}
diff --git a/src/main/java/com/google/protobuf/Utf8.java b/src/main/java/com/google/protobuf/Utf8.java
-index 104ab0983..0a15447a3 100644
+index 7c9133e16..657d92640 100644
--- a/src/main/java/com/google/protobuf/Utf8.java
+++ b/src/main/java/com/google/protobuf/Utf8.java
@@ -218,6 +218,16 @@ final class Utf8 {
diff --git a/hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch b/hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch
index 7451b24..f71d281 100644
--- a/hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch
+++ b/hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch
@@ -1,8 +1,8 @@
diff --git a/src/main/java/com/google/protobuf/CodedInputStream.java b/src/main/java/com/google/protobuf/CodedInputStream.java
-index 598c6929b..a9b70afb4 100644
+index bcd5639e8..b649d23a4 100644
--- a/src/main/java/com/google/protobuf/CodedInputStream.java
+++ b/src/main/java/com/google/protobuf/CodedInputStream.java
-@@ -195,11 +195,7 @@ public abstract class CodedInputStream {
+@@ -202,11 +202,7 @@ public abstract class CodedInputStream {
}
/** Create a new CodedInputStream wrapping the given {@link ByteInput}. */
diff --git a/pom.xml b/pom.xml
index ff81602..2833a81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<java.min.version>${compileSource}</java.min.version>
<maven.min.version>3.3.3</maven.min.version>
<rename.offset>org.apache.hbase.thirdparty</rename.offset>
- <protobuf.version>3.17.1</protobuf.version>
+ <protobuf.version>3.19.1</protobuf.version>
<netty.version>4.1.65.Final</netty.version>
<guava.version>30.1.1-jre</guava.version>
<commons-cli.version>1.4</commons-cli.version>