Skip to content

Commit 937552c

Browse files
authored
HBASE-28764 [hbase-thirdparty] Bump protobuf version from 4.26.1 to 4.27.3 (#120)
Signed-off-by: Duo Zhang <zhangduo@apache.org>
1 parent 3a80d8d commit 937552c

3 files changed

Lines changed: 20 additions & 9 deletions

File tree

hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch renamed to hbase-shaded-protobuf/src/main/patches/HBASE-15789_V3.patch

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,11 +359,11 @@ index 000000000..320977290
359359
+ }
360360
+}
361361
diff --git a/src/main/java/com/google/protobuf/ByteString.java b/src/main/java/com/google/protobuf/ByteString.java
362-
index 8ba729c8e..62aae86ee 100644
362+
index 7b2455f12..f906a4774 100644
363363
--- a/src/main/java/com/google/protobuf/ByteString.java
364364
+++ b/src/main/java/com/google/protobuf/ByteString.java
365-
@@ -422,6 +422,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
366-
}
365+
@@ -430,6 +430,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
366+
return new NioByteString(buffer);
367367
}
368368

369369
+ /**
@@ -376,8 +376,17 @@ index 8ba729c8e..62aae86ee 100644
376376
/**
377377
* Wraps the given bytes into a {@code ByteString}. Intended for internal usage within the library
378378
* to force a classload of ByteString before LiteralByteString.
379+
@@ -961,8 +968,6 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
380+
* @return true for equality of substrings, else false.
381+
*/
382+
abstract boolean equalsRange(ByteString other, int offset, int length);
383+
-
384+
- private LeafByteString() {}
385+
}
386+
387+
/**
379388
diff --git a/src/main/java/com/google/protobuf/CodedInputStream.java b/src/main/java/com/google/protobuf/CodedInputStream.java
380-
index 224ced529..64c3efa37 100644
389+
index 81da41778..80fd9153c 100644
381390
--- a/src/main/java/com/google/protobuf/CodedInputStream.java
382391
+++ b/src/main/java/com/google/protobuf/CodedInputStream.java
383392
@@ -178,6 +178,15 @@ public abstract class CodedInputStream {
@@ -396,7 +405,7 @@ index 224ced529..64c3efa37 100644
396405
/** Disable construction/inheritance outside of this class. */
397406
private CodedInputStream() {}
398407

399-
@@ -3957,4 +3966,652 @@ public abstract class CodedInputStream {
408+
@@ -3970,4 +3979,652 @@ public abstract class CodedInputStream {
400409
}
401410
}
402411
}
@@ -1265,3 +1274,4 @@ index d52006754..92ed1f1f7 100644
12651274
/**
12661275
* Encodes an input character sequence ({@code in}) to UTF-8 in the target array ({@code out}).
12671276
* For a string, this method is similar to
1277+

hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/main/java/com/google/protobuf/CodedInputStream.java b/src/main/java/com/google/protobuf/CodedInputStream.java
2-
index 64c3efa37..a5455e7f5 100644
2+
index 80fd9153c..11de874dd 100644
33
--- a/src/main/java/com/google/protobuf/CodedInputStream.java
44
+++ b/src/main/java/com/google/protobuf/CodedInputStream.java
55
@@ -179,11 +179,7 @@ public abstract class CodedInputStream {
@@ -16,10 +16,10 @@ index 64c3efa37..a5455e7f5 100644
1616
}
1717

1818
diff --git a/src/main/java/com/google/protobuf/UnsafeByteOperations.java b/src/main/java/com/google/protobuf/UnsafeByteOperations.java
19-
index 06121780f..3afb65965 100644
19+
index 15c1da969..54d2f975a 100644
2020
--- a/src/main/java/com/google/protobuf/UnsafeByteOperations.java
2121
+++ b/src/main/java/com/google/protobuf/UnsafeByteOperations.java
22-
@@ -75,6 +75,17 @@ public final class UnsafeByteOperations {
22+
@@ -74,6 +74,17 @@ public final class UnsafeByteOperations {
2323
return ByteString.wrap(buffer);
2424
}
2525

@@ -37,3 +37,4 @@ index 06121780f..3afb65965 100644
3737
/**
3838
* Writes the given {@link ByteString} to the provided {@link ByteOutput}. Calling this method may
3939
* result in multiple operations on the target {@link ByteOutput} (i.e. for roped {@link
40+

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<maven.min.version>3.3.3</maven.min.version>
135135
<os.maven.version>1.7.1</os.maven.version>
136136
<rename.offset>org.apache.hbase.thirdparty</rename.offset>
137-
<protobuf.version>4.26.1</protobuf.version>
137+
<protobuf.version>4.27.3</protobuf.version>
138138
<netty.version>4.1.112.Final</netty.version>
139139
<netty.tcnative.version>2.0.61.Final</netty.tcnative.version>
140140
<guava.version>33.2.1-jre</guava.version>

0 commit comments

Comments
 (0)