From 941a5cfdb99856886b620172155998b71f5c0388 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Sat, 13 Apr 2019 21:35:41 +0800 Subject: [PATCH] HBASE-22233 [hbase-thirdparty] Add error prone annotations dependency explicitly and do not relocate it --- hbase-shaded-miscellaneous/pom.xml | 9 ++++++++- pom.xml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hbase-shaded-miscellaneous/pom.xml b/hbase-shaded-miscellaneous/pom.xml index 1e93600..3014c16 100644 --- a/hbase-shaded-miscellaneous/pom.xml +++ b/hbase-shaded-miscellaneous/pom.xml @@ -73,7 +73,9 @@ com.google ${rename.offset}.com.google - com.google.errorprone.annotations.CanIgnoreReturnValue + com.google.errorprone.* + com.google.errorprone.annotations.* + com.google.errorprone.annotations.concurrent.* @@ -172,5 +174,10 @@ commons-collections4 4.3 + + com.google.errorprone + error_prone_annotations + 2.3.3 + diff --git a/pom.xml b/pom.xml index bff04b9..501bb9e 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ ${compileSource} 3.3.3 org.apache.hbase.thirdparty - 3.7.0 + 3.7.1 -- 2.17.1