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/03/30 15:53:46 UTC
[hbase-thirdparty] branch master updated: HBASE-22130
[hbase-thirdparty] Upgrade thirdparty dependencies
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 ade3cce HBASE-22130 [hbase-thirdparty] Upgrade thirdparty dependencies
ade3cce is described below
commit ade3ccec6cd3dca96cfe0620d2e930b29d30b76f
Author: zhangduo <zh...@apache.org>
AuthorDate: Sat Mar 30 09:23:44 2019 +0800
HBASE-22130 [hbase-thirdparty] Upgrade thirdparty dependencies
---
hbase-shaded-miscellaneous/pom.xml | 22 ++++++++++++++++------
hbase-shaded-netty/pom.xml | 2 +-
hbase-shaded-protobuf/pom.xml | 7 ++-----
.../src/main/patches/HBASE-15789_V2.patch | 15 ++++++++++-----
pom.xml | 11 ++++++-----
5 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/hbase-shaded-miscellaneous/pom.xml b/hbase-shaded-miscellaneous/pom.xml
index 8ab697c..3e3e671 100644
--- a/hbase-shaded-miscellaneous/pom.xml
+++ b/hbase-shaded-miscellaneous/pom.xml
@@ -114,12 +114,12 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.1</version>
+ <version>2.8.5</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>22.0</version>
+ <version>27.1-jre</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -137,14 +137,24 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
</exclusion>
+ <!-- Just an empty jar-->
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
- <!--Version should be same as protobuf except sometimes
- they publish new protobuf version w/o updating util.-->
- <version>3.3.0</version>
+ <!--Version should be same as protobuf in adjacent module
+ except sometimes they publish new protobuf version w/o
+ updating util.-->
+ <version>${protobuf.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
@@ -160,7 +170,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.1</version>
+ <version>4.3</version>
</dependency>
</dependencies>
</project>
diff --git a/hbase-shaded-netty/pom.xml b/hbase-shaded-netty/pom.xml
index 5cc5465..ce5fe35 100644
--- a/hbase-shaded-netty/pom.xml
+++ b/hbase-shaded-netty/pom.xml
@@ -144,7 +144,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.17.Final</version>
+ <version>4.1.34.Final</version>
</dependency>
</dependencies>
</project>
diff --git a/hbase-shaded-protobuf/pom.xml b/hbase-shaded-protobuf/pom.xml
index 18a8e98..def2018 100644
--- a/hbase-shaded-protobuf/pom.xml
+++ b/hbase-shaded-protobuf/pom.xml
@@ -31,9 +31,6 @@
<description>
Pulls down protobuf, patches it, compiles, and then relocates/shades.
</description>
- <properties>
- <protobuf.version>3.5.1</protobuf.version>
- </properties>
<build>
<plugins>
<plugin>
@@ -82,7 +79,7 @@
src/main/java)-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
+ <version>3.1.1</version>
<executions>
<execution>
<id>unpack</id>
@@ -110,7 +107,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.8.0</version>
</plugin>
<!--Apply our patches to the unpacked protobuf src-->
<plugin>
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 cef5cfc..c3300c5 100644
--- a/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
+++ b/hbase-shaded-protobuf/src/main/patches/HBASE-15789_V2.patch
@@ -5,11 +5,11 @@ index c0ed636..906c216 100644
@@ -112,7 +112,7 @@ final class ByteBufferWriter {
}
}
-
+
- private static byte[] getOrCreateBuffer(int requestedSize) {
+ static byte[] getOrCreateBuffer(int requestedSize) {
requestedSize = max(requestedSize, MIN_CACHED_BUFFER_SIZE);
-
+
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
@@ -103,7 +103,7 @@ new file mode 100644
index 0000000..1949602
--- /dev/null
+++ b/src/main/java/com/google/protobuf/ByteInputByteString.java
-@@ -0,0 +1,249 @@
+@@ -0,0 +1,254 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc. All rights reserved.
+// https://developers.google.com/protocol-buffers/
@@ -187,6 +187,11 @@ index 0000000..1949602
+ return buffer.read(getAbsoluteOffset(index));
+ }
+
++ @Override
++ byte internalByteAt(int index) {
++ return buffer.read(getAbsoluteOffset(index));
++ }
++
+ private int getAbsoluteOffset(int relativeOffset) {
+ return this.offset + relativeOffset;
+ }
@@ -368,8 +373,8 @@ index 8cae888..ebfa7fa 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 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
diff --git a/pom.xml b/pom.xml
index 2af80de..e20df51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>21</version>
<relativePath/>
<!-- no parent resolution -->
</parent>
@@ -126,6 +126,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.0</protobuf.version>
</properties>
<build>
<pluginManagement>
@@ -150,7 +151,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -214,7 +215,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.1</version>
</plugin>
</plugins>
</pluginManagement>
@@ -235,7 +236,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4</version>
+ <version>1.4.1</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
@@ -283,7 +284,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.1</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/src.xml</descriptor>