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 2023/09/19 06:32:35 UTC
[hbase-thirdparty] branch master updated: HBASE-28093 [hbase-thirdparty] Bump thirdparty dependencies (#102)
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 1f87a57 HBASE-28093 [hbase-thirdparty] Bump thirdparty dependencies (#102)
1f87a57 is described below
commit 1f87a57d5e1633c0fc9bde6ac504b722f3217d42
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Tue Sep 19 14:32:29 2023 +0800
HBASE-28093 [hbase-thirdparty] Bump thirdparty dependencies (#102)
Signed-off-by: Nihal Jain <ni...@apache.org>
---
.../src/main/patches/HBASE-15789_V2.patch | 16 ++++++++--------
hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch | 4 ++--
pom.xml | 16 ++++++++--------
3 files changed, 18 insertions(+), 18 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 bd23603..8e09530 100644
--- a/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
+++ b/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
@@ -1,5 +1,5 @@
diff --git a/src/main/java/com/google/protobuf/ByteBufferWriter.java b/src/main/java/com/google/protobuf/ByteBufferWriter.java
-index 2cb3ada67..6e1737c45 100644
+index 3970b0ea5..571b0a975 100644
--- a/src/main/java/com/google/protobuf/ByteBufferWriter.java
+++ b/src/main/java/com/google/protobuf/ByteBufferWriter.java
@@ -111,7 +111,7 @@ final class ByteBufferWriter {
@@ -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 480f85fd6..dd8b913ff 100644
+index 2569d5dad..bebee3373 100644
--- a/src/main/java/com/google/protobuf/ByteString.java
+++ b/src/main/java/com/google/protobuf/ByteString.java
-@@ -442,6 +442,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
+@@ -445,6 +445,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
}
}
@@ -374,10 +374,10 @@ index 480f85fd6..dd8b913ff 100644
+ }
+
/**
- * Wraps the given bytes into a {@code ByteString}. Intended for internal only usage to force a
- * classload of ByteString before LiteralByteString.
+ * Wraps the given bytes into a {@code ByteString}. Intended for internal usage within the library
+ * 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 b3074b5b5..7d457294c 100644
+index ae94ee887..ce1d05875 100644
--- a/src/main/java/com/google/protobuf/CodedInputStream.java
+++ b/src/main/java/com/google/protobuf/CodedInputStream.java
@@ -200,6 +200,16 @@ public abstract class CodedInputStream {
@@ -397,7 +397,7 @@ index b3074b5b5..7d457294c 100644
/** Disable construction/inheritance outside of this class. */
private CodedInputStream() {}
-@@ -3979,4 +3989,652 @@ public abstract class CodedInputStream {
+@@ -3965,4 +3975,652 @@ public abstract class CodedInputStream {
}
}
}
@@ -1051,7 +1051,7 @@ index b3074b5b5..7d457294c 100644
+ }
}
diff --git a/src/main/java/com/google/protobuf/Utf8.java b/src/main/java/com/google/protobuf/Utf8.java
-index c74497cd8..c58316ded 100644
+index 7c6823d91..20afe8255 100644
--- a/src/main/java/com/google/protobuf/Utf8.java
+++ b/src/main/java/com/google/protobuf/Utf8.java
@@ -219,6 +219,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 51596db..4843755 100644
--- a/hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch
+++ b/hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch
@@ -1,5 +1,5 @@
diff --git a/src/main/java/com/google/protobuf/CodedInputStream.java b/src/main/java/com/google/protobuf/CodedInputStream.java
-index 7d457294c..ff5a487ec 100644
+index ce1d05875..5d74971ff 100644
--- a/src/main/java/com/google/protobuf/CodedInputStream.java
+++ b/src/main/java/com/google/protobuf/CodedInputStream.java
@@ -202,11 +202,7 @@ public abstract class CodedInputStream {
@@ -16,7 +16,7 @@ index 7d457294c..ff5a487ec 100644
}
diff --git a/src/main/java/com/google/protobuf/UnsafeByteOperations.java b/src/main/java/com/google/protobuf/UnsafeByteOperations.java
-index 16521e1bd..73b493360 100644
+index 164010e43..8b3857069 100644
--- a/src/main/java/com/google/protobuf/UnsafeByteOperations.java
+++ b/src/main/java/com/google/protobuf/UnsafeByteOperations.java
@@ -98,6 +98,17 @@ public final class UnsafeByteOperations {
diff --git a/pom.xml b/pom.xml
index f22ae32..53a6a1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,22 +132,22 @@
<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.21.12</protobuf.version>
- <netty.version>4.1.87.Final</netty.version>
- <guava.version>31.1-jre</guava.version>
+ <protobuf.version>3.24.3</protobuf.version>
+ <netty.version>4.1.97.Final</netty.version>
+ <guava.version>32.1.2-jre</guava.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-collections.version>4.4</commons-collections.version>
- <error_prone_annotations.version>2.18.0</error_prone_annotations.version>
+ <error_prone_annotations.version>2.21.1</error_prone_annotations.version>
<gson.version>2.10.1</gson.version>
- <jetty.version>9.4.50.v20221201</jetty.version>
+ <jetty.version>9.4.52.v20230823</jetty.version>
<servlet-api.version>3.1.0</servlet-api.version>
- <jersey.version>2.38</jersey.version>
+ <jersey.version>2.40</jersey.version>
<jakarta.inject.version>2.6.1</jakarta.inject.version>
<jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
<jakarta.validation-api.version>2.0.2</jakarta.validation-api.version>
- <javassist.version>3.25.0-GA</javassist.version>
- <jackson-jaxrs-json-provider.version>2.14.1</jackson-jaxrs-json-provider.version>
+ <javassist.version>3.29.2-GA</javassist.version>
+ <jackson-jaxrs-json-provider.version>2.15.2</jackson-jaxrs-json-provider.version>
</properties>
<build>
<pluginManagement>