You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2022/02/23 03:02:00 UTC
[hbase-thirdparty] branch branch-3 updated (470a2df -> dedc27c)
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a change to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase-thirdparty.git.
from 470a2df Revert "HBASE-26746 Update protobuf-java to 3.19.4 (#77)"
new 506feb9 HBASE-26500 [hbase-thirdparty] Bump protobuf version to 3.19.1 (#58)
new dedc27c HBASE-26746 Update protobuf-java to 3.19.4 (#77)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
[hbase-thirdparty] 02/02: HBASE-26746 Update protobuf-java to 3.19.4 (#77)
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase-thirdparty.git
commit dedc27c51a89517e3b83fd7ba49fa7ba04b3d3ed
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Fri Feb 18 19:23:47 2022 -0600
HBASE-26746 Update protobuf-java to 3.19.4 (#77)
Signed-off-by: Andrew Purtell <ap...@apache.org>
Signed-off-by: Pankaj Kumar <pa...@apache.org>
Signed-off-by: Tak Lon (Stephen) Wu <ta...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 358b11e..5478dbb 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.19.1</protobuf.version>
+ <protobuf.version>3.19.4</protobuf.version>
<netty.version>4.1.73.Final</netty.version>
<guava.version>30.1.1-jre</guava.version>
<commons-cli.version>1.4</commons-cli.version>
[hbase-thirdparty] 01/02: HBASE-26500 [hbase-thirdparty] Bump protobuf version to 3.19.1 (#58)
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase-thirdparty.git
commit 506feb94045039379665f6f5b56a4d091eb61b0f
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>
Conflicts:
pom.xml
---
.../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 79305d6..358b11e 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.73.Final</netty.version>
<guava.version>30.1.1-jre</guava.version>
<commons-cli.version>1.4</commons-cli.version>