From 387a5da46210b109321b2606bbd155c43bb59394 Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Tue, 2 Apr 2019 21:36:04 -0700
Subject: [PATCH] HBASE-22155 Move 2.2.0 on to hbase-thirdparty-2.2.0

---
 .../main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java  | 4 +++-
 pom.xml                                                       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index 23237afcced..17dfa6e13b2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -1829,7 +1829,9 @@ public class HBaseAdmin implements Admin {
       // TODO: how long should we wait? Spin forever?
       return future.get(timeout, units);
     } catch (InterruptedException e) {
-      throw new InterruptedIOException("Interrupt while waiting on " + future);
+      IOException ioe = new InterruptedIOException("Interrupt while waiting on " + future);
+      ioe.initCause(e);
+      throw ioe;
     } catch (TimeoutException e) {
       throw new TimeoutIOException(e);
     } catch (ExecutionException e) {
diff --git a/pom.xml b/pom.xml
index 7914bebd577..ba0e14c84f9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1576,7 +1576,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.1.0</hbase-thirdparty.version>
+    <hbase-thirdparty.version>2.2.0</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. -->