From 1e821aa9ce7ccfe2a6657f9297643eba7d6a7547 Mon Sep 17 00:00:00 2001
From: zhangduo <zhangduo@apache.org>
Date: Sat, 13 Apr 2019 21:50:59 +0800
Subject: [PATCH] HBASE-22222 Site build fails after hbase-thirdparty upgrade

Signed-off-by: Guanghao Zhang <zghao@apache.org>
Signed-off-by: Sean Busbey <busbey@apache.org>
---
 .../main/resources/supplemental-models.xml    | 19 +++++++++++++++++++
 pom.xml                                       |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index c3ffc3ba694..7b875116b66 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -1884,4 +1884,23 @@ Copyright (c) 2007-2017 The JRuby project
       </licenses>
     </project>
   </supplement>
+    <supplement>
+    <project>
+      <groupId>com.google.errorprone</groupId>
+      <artifactId>error_prone_annotations</artifactId>
+
+      <organization>
+        <name>Google</name>
+        <url>http://www.google.com</url>
+      </organization>
+      <licenses>
+        <license>
+          <!-- It has been incorrectly called Apache 2.0 in the original pom-->
+          <name>Apache License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
 </supplementalDataModels>
diff --git a/pom.xml b/pom.xml
index 5759e405574..d286f567be6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1577,7 +1577,7 @@
     <spotbugs.version>3.1.11</spotbugs.version>
     <wagon.ssh.version>2.12</wagon.ssh.version>
     <xml.maven.version>1.0.1</xml.maven.version>
-    <hbase-thirdparty.version>2.2.0</hbase-thirdparty.version>
+    <hbase-thirdparty.version>2.2.1</hbase-thirdparty.version>
     <!-- Intraproject jar naming properties -->
     <!-- TODO this is pretty ugly, but works for the moment.
       Modules are pretty heavy-weight things, so doing this work isn't too bad. -->