You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2019/09/28 16:59:47 UTC
[hbase-thirdparty] branch master updated: HBASE-23088
[hbase-thirdparty] Upgrade the dependencies for hbase-thirdparty (#7)
This is an automated email from the ASF dual-hosted git repository.
stack 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 401d1ab HBASE-23088 [hbase-thirdparty] Upgrade the dependencies for hbase-thirdparty (#7)
401d1ab is described below
commit 401d1ab3334f1f214873d4c6db7fce8e7ea0430f
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sun Sep 29 00:59:42 2019 +0800
HBASE-23088 [hbase-thirdparty] Upgrade the dependencies for hbase-thirdparty (#7)
netty-all: 4.1.34.Final => 4.1.41.Final
guava: 27.1-jre => 28.1-jre
commons-collections4: 4.3 => 4.4
protobuf: 3.7.1 => 3.9.2
Signed-off-by: Sean Busbey <bu...@apache.org>
Signed-off-by: stack <st...@apache.org>
---
hbase-shaded-miscellaneous/pom.xml | 4 +--
hbase-shaded-netty/pom.xml | 2 +-
.../src/main/patches/HBASE-15789_V2.patch | 42 +++++++++++-----------
.../src/main/patches/HBASE-17087.patch | 4 +--
.../src/main/patches/HBASE-17239.patch | 14 ++++----
pom.xml | 2 +-
6 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/hbase-shaded-miscellaneous/pom.xml b/hbase-shaded-miscellaneous/pom.xml
index abfc26b..f475ed0 100644
--- a/hbase-shaded-miscellaneous/pom.xml
+++ b/hbase-shaded-miscellaneous/pom.xml
@@ -124,7 +124,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>27.1-jre</version>
+ <version>28.1-jre</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.3</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
diff --git a/hbase-shaded-netty/pom.xml b/hbase-shaded-netty/pom.xml
index 96adcc5..3df12d4 100644
--- a/hbase-shaded-netty/pom.xml
+++ b/hbase-shaded-netty/pom.xml
@@ -141,7 +141,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.34.Final</version>
+ <version>4.1.41.Final</version>
</dependency>
</dependencies>
</project>
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 c3300c5..5cddf90 100644
--- a/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
+++ b/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
@@ -1,8 +1,8 @@
diff --git a/src/main/java/com/google/protobuf/ByteBufferWriter.java b/src/main/java/com/google/protobuf/ByteBufferWriter.java
-index c0ed636..906c216 100644
+index 2cb3ada67..6e1737c45 100644
--- a/src/main/java/com/google/protobuf/ByteBufferWriter.java
+++ b/src/main/java/com/google/protobuf/ByteBufferWriter.java
-@@ -112,7 +112,7 @@ final class ByteBufferWriter {
+@@ -111,7 +111,7 @@ final class ByteBufferWriter {
}
}
@@ -13,7 +13,7 @@ index c0ed636..906c216 100644
byte[] buffer = getBuffer();
diff --git a/src/main/java/com/google/protobuf/ByteInput.java b/src/main/java/com/google/protobuf/ByteInput.java
new file mode 100644
-index 0000000..a745d37
+index 000000000..37c3824a3
--- /dev/null
+++ b/src/main/java/com/google/protobuf/ByteInput.java
@@ -0,0 +1,81 @@
@@ -100,7 +100,7 @@ index 0000000..a745d37
+}
diff --git a/src/main/java/com/google/protobuf/ByteInputByteString.java b/src/main/java/com/google/protobuf/ByteInputByteString.java
new file mode 100644
-index 0000000..1949602
+index 000000000..320977290
--- /dev/null
+++ b/src/main/java/com/google/protobuf/ByteInputByteString.java
@@ -0,0 +1,254 @@
@@ -359,28 +359,28 @@ index 0000000..1949602
+ }
+}
diff --git a/src/main/java/com/google/protobuf/ByteString.java b/src/main/java/com/google/protobuf/ByteString.java
-index 8cae888..ebfa7fa 100644
+index e5454a63d..697a8aee7 100644
--- a/src/main/java/com/google/protobuf/ByteString.java
+++ b/src/main/java/com/google/protobuf/ByteString.java
-@@ -323,6 +323,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
+@@ -373,6 +373,13 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
+ }
}
- /**
++ /**
+ * Wraps the given bytes into a {@code ByteString}. Intended for internal only usage.
+ */
+ static ByteString wrap(ByteInput buffer, int offset, int length) {
+ return new ByteInputByteString(buffer, offset, length);
+ }
+
-+ /**
+ /**
* 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 12d70ce..e4c8e05 100644
+index 87c683725..598c6929b 100644
--- a/src/main/java/com/google/protobuf/CodedInputStream.java
+++ b/src/main/java/com/google/protobuf/CodedInputStream.java
-@@ -149,6 +149,15 @@ public abstract class CodedInputStream {
+@@ -194,6 +194,15 @@ public abstract class CodedInputStream {
return newInstance(buffer, 0, buffer.length, true);
}
@@ -396,8 +396,8 @@ index 12d70ce..e4c8e05 100644
/** Disable construction/inheritance outside of this class. */
private CodedInputStream() {}
-@@ -2892,4 +2901,652 @@ public abstract class CodedInputStream {
- pos = size - tempPos;
+@@ -3919,4 +3928,652 @@ public abstract class CodedInputStream {
+ }
}
}
+
@@ -1050,10 +1050,10 @@ index 12d70ce..e4c8e05 100644
+ }
}
diff --git a/src/main/java/com/google/protobuf/Utf8.java b/src/main/java/com/google/protobuf/Utf8.java
-index e6a497d..b84efd6 100644
+index 104ab0983..0a15447a3 100644
--- a/src/main/java/com/google/protobuf/Utf8.java
+++ b/src/main/java/com/google/protobuf/Utf8.java
-@@ -229,6 +229,16 @@ final class Utf8 {
+@@ -218,6 +218,16 @@ final class Utf8 {
}
}
@@ -1070,10 +1070,11 @@ index e6a497d..b84efd6 100644
// These UTF-8 handling methods are copied from Guava's Utf8 class with a modification to throw
// a protocol buffer local exception. This exception is then caught in CodedOutputStream so it can
// fallback to more lenient behavior.
-@@ -332,6 +342,24 @@ final class Utf8 {
+@@ -340,6 +350,24 @@ final class Utf8 {
+ return processor.decodeUtf8(bytes, index, size);
}
- /**
++ /**
+ * Determines if the given {@link ByteInput} is a valid UTF-8 string.
+ *
+ * @param buffer the buffer to check.
@@ -1091,12 +1092,11 @@ index e6a497d..b84efd6 100644
+ return processor.partialIsValidUtf8(state, buffer, index, limit);
+ }
+
-+ /**
+ /**
* Encodes the given characters to the target {@link ByteBuffer} using UTF-8 encoding.
*
- * <p>Selects an optimal algorithm based on the type of {@link ByteBuffer} (i.e. heap or direct)
-@@ -610,6 +638,169 @@ final class Utf8 {
- }
+@@ -716,6 +744,169 @@ final class Utf8 {
+ return new String(resultArr, 0, resultPos);
}
+ public boolean isValidUtf8(ByteInput buffer, int index, int limit) {
diff --git a/hbase-shaded-protobuf/src/main/patches/HBASE-17087.patch b/hbase-shaded-protobuf/src/main/patches/HBASE-17087.patch
index 9b9ddcd..297d2cf 100644
--- a/hbase-shaded-protobuf/src/main/patches/HBASE-17087.patch
+++ b/hbase-shaded-protobuf/src/main/patches/HBASE-17087.patch
@@ -1,8 +1,8 @@
diff --git a/src/main/java/com/google/protobuf/ByteInputByteString.java b/src/main/java/com/google/protobuf/ByteInputByteString.java
-index 1949602..30de4ec 100644
+index 320977290..2e5776eea 100644
--- a/src/main/java/com/google/protobuf/ByteInputByteString.java
+++ b/src/main/java/com/google/protobuf/ByteInputByteString.java
-@@ -244,6 +244,8 @@ final class ByteInputByteString extends ByteString.LeafByteString {
+@@ -249,6 +249,8 @@ final class ByteInputByteString extends ByteString.LeafByteString {
public CodedInputStream newCodedInput() {
// We trust CodedInputStream not to modify the bytes, or to give anyone
// else access to them.
diff --git a/hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch b/hbase-shaded-protobuf/src/main/patches/HBASE-17239.patch
index 1ac3a5a..7451b24 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 0ad20e5..0bff626 100644
+index 598c6929b..a9b70afb4 100644
--- a/src/main/java/com/google/protobuf/CodedInputStream.java
+++ b/src/main/java/com/google/protobuf/CodedInputStream.java
-@@ -150,11 +150,7 @@ public abstract class CodedInputStream {
+@@ -195,11 +195,7 @@ public abstract class CodedInputStream {
}
/** Create a new CodedInputStream wrapping the given {@link ByteInput}. */
@@ -16,13 +16,14 @@ index 0ad20e5..0bff626 100644
}
diff --git a/src/main/java/com/google/protobuf/UnsafeByteOperations.java b/src/main/java/com/google/protobuf/UnsafeByteOperations.java
-index 3d53f2e..ad99372 100644
+index bcaf1d2f3..d207f2be7 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 {
+ return ByteString.wrap(buffer);
}
- /**
++ /**
+ * An unsafe operation that returns a {@link ByteString} that is backed by the provided buffer.
+ * @param buffer the ByteInput buffer to be wrapped
+ * @param offset the offset of the wrapped byteinput
@@ -33,7 +34,6 @@ index 3d53f2e..ad99372 100644
+ return ByteString.wrap(buffer, offset, len);
+ }
+
-+ /**
+ /**
* Writes the given {@link ByteString} to the provided {@link ByteOutput}. Calling this method may
- * result in multiple operations on the target {@link ByteOutput}
- * (i.e. for roped {@link ByteString}s).
+ * result in multiple operations on the target {@link ByteOutput} (i.e. for roped {@link
diff --git a/pom.xml b/pom.xml
index 1e3c210..3170db9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,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.7.1</protobuf.version>
+ <protobuf.version>3.9.2</protobuf.version>
</properties>
<build>
<pluginManagement>