From d023508b5b0deb5b2f9b7edaf59b0c95bfdf3b47 Mon Sep 17 00:00:00 2001
From: Balazs Meszaros <balazs.meszaros@cloudera.com>
Date: Wed, 3 May 2017 14:43:51 +0200
Subject: [PATCH] HBASE-17898 Update dependencies

Signed-off-by: Michael Stack <stack@apache.org>
---
 hbase-thrift/pom.xml |  4 ----
 pom.xml              | 39 ++++++++++++++++-----------------------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index f9d73d67911..c506f444651 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -232,10 +232,6 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
diff --git a/pom.xml b/pom.xml
index d13b475c866..70049098e7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1238,56 +1238,54 @@
     <compat.module>hbase-hadoop2-compat</compat.module>
     <assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file>
     <!-- end HBASE-15925 default hadoop compatibility values -->
-    <commons-cli.version>1.3.1</commons-cli.version>
+    <commons-cli.version>1.4</commons-cli.version>
     <commons-codec.version>1.9</commons-codec.version>
     <!-- pretty outdated -->
-    <commons-io.version>2.4</commons-io.version>
+    <commons-io.version>2.5</commons-io.version>
     <commons-lang.version>2.6</commons-lang.version>
     <commons-logging.version>1.2</commons-logging.version>
     <commons-math.version>2.2</commons-math.version>
-    <commons-net.version>3.1</commons-net.version>
     <disruptor.version>3.3.6</disruptor.version>
     <!-- Do not use versions earlier than 3.2.2 due to a security vulnerability -->
     <collections.version>3.2.2</collections.version>
-    <httpclient.version>4.5.2</httpclient.version>
-    <httpcore.version>4.4.4</httpcore.version>
-    <metrics-core.version>3.1.2</metrics-core.version>
+    <httpclient.version>4.5.3</httpclient.version>
+    <httpcore.version>4.4.6</httpcore.version>
+    <metrics-core.version>3.2.1</metrics-core.version>
     <guava.version>12.0.1</guava.version>
     <jackson.version>2.23.2</jackson.version>
-    <jaxb-api.version>2.2.2</jaxb-api.version>
+    <jaxb-api.version>2.2.12</jaxb-api.version>
     <jetty.version>9.3.8.v20160314</jetty.version>
     <jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version>
     <jackson1.version>1.9.13</jackson1.version>
     <servlet.api.version>3.1.0</servlet.api.version>
-    <jersey.version>2.22.2</jersey.version>
-    <jetty6.version>6.1.26</jetty6.version>
+    <jersey.version>2.25.1</jersey.version>
     <jetty.jspapi.version>6.1.14</jetty.jspapi.version>
-    <jruby.version>9.1.9.0</jruby.version>
+    <jruby.version>9.1.10.0</jruby.version>
     <junit.version>4.12</junit.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <htrace.version>3.1.0-incubating</htrace.version>
+    <htrace.version>3.2.0-incubating</htrace.version>
     <log4j.version>1.2.17</log4j.version>
-    <mockito-all.version>1.10.8</mockito-all.version>
+    <mockito-all.version>1.10.19</mockito-all.version>
     <!--Internally we use a different version of protobuf. See hbase-protocol-shaded-->
     <external.protobuf.version>2.5.0</external.protobuf.version>
     <protobuf.plugin.version>0.5.0</protobuf.plugin.version>
     <thrift.path>thrift</thrift.path>
     <thrift.version>0.9.3</thrift.version>
-    <zookeeper.version>3.4.8</zookeeper.version>
-    <slf4j.version>1.7.7</slf4j.version>
+    <zookeeper.version>3.4.9</zookeeper.version>
+    <slf4j.version>1.7.24</slf4j.version>
     <clover.version>4.0.3</clover.version>
     <jamon-runtime.version>2.4.1</jamon-runtime.version>
-    <jettison.version>1.3.3</jettison.version>
-    <netty.version>4.1.1.Final</netty.version>
+    <jettison.version>1.3.8</jettison.version>
+    <netty.version>4.1.9.Final</netty.version>
     <netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
     <!--Make sure these joni/jcodings are compatible with the versions used by jruby-->
     <joni.version>2.1.11</joni.version>
     <jcodings.version>1.0.18</jcodings.version>
-    <spy.version>2.11.6</spy.version>
+    <spy.version>2.12.2</spy.version>
     <bouncycastle.version>1.46</bouncycastle.version>
     <kerby.version>1.0.0-RC2</kerby.version>
     <commons-crypto.version>1.0.0</commons-crypto.version>
-    <curator.version>2.11.0</curator.version>
+    <curator.version>2.12.0</curator.version>
     <!-- Plugin Dependencies -->
     <maven.assembly.version>2.4</maven.assembly.version>
     <maven.antrun.version>1.8</maven.antrun.version>
@@ -1623,11 +1621,6 @@
         <artifactId>commons-logging</artifactId>
         <version>${commons-logging.version}</version>
       </dependency>
-      <dependency>
-        <groupId>commons-net</groupId>
-        <artifactId>commons-net</artifactId>
-        <version>${commons-net.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-math</artifactId>