From 4217a27837e18355b56bed914c185d7f0491c36c Mon Sep 17 00:00:00 2001 From: Balazs Meszaros Date: Wed, 3 May 2017 14:43:51 +0200 Subject: [PATCH] HBASE-17898 Update dependencies --- hbase-thrift/pom.xml | 4 --- .../hadoop/hbase/thrift/TestThriftHttpServer.java | 4 +-- pom.xml | 41 +++++++++------------- 3 files changed, 19 insertions(+), 30 deletions(-) diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 6e4fd5c399..b6253869bf 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -233,10 +233,6 @@ commons-logging - commons-net - commons-net - - commons-cli commons-cli diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java index c04b36f0b5..77e204548f 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java @@ -112,12 +112,12 @@ public class TestThriftHttpServer { try { runThriftServer(1024 * 63); } catch (TTransportException tex) { - assertFalse(tex.getMessage().equals("HTTP Response code: 413")); + assertFalse(tex.getMessage().equals("HTTP Response code: 431")); } // Test thrift server with HTTP header length more than 64k, expect an exception exception.expect(TTransportException.class); - exception.expectMessage("HTTP Response code: 413"); + exception.expectMessage("HTTP Response code: 431"); runThriftServer(1024 * 64); } diff --git a/pom.xml b/pom.xml index d805d64962..8ad190c410 100644 --- a/pom.xml +++ b/pom.xml @@ -1238,56 +1238,54 @@ hbase-hadoop2-compat src/main/assembly/hadoop-two-compat.xml - 1.3.1 + 1.4 1.9 - 2.4 + 2.5 2.6 1.2 2.2 - 3.1 3.3.6 3.2.2 - 4.5.2 - 4.4.4 - 3.1.2 + 4.5.3 + 4.4.6 + 3.2.1 12.0.1 2.23.2 - 2.2.2 - 9.3.8.v20160314 + 2.2.12 + 9.4.3.v20170317 9.2.19.v20160908 1.9.13 3.1.0 - 2.22.2 - 6.1.26 + 2.25.1 6.1.14 - 9.1.9.0 + 9.1.10.0 4.12 1.3 - 3.1.0-incubating + 3.2.0-incubating 1.2.17 - 1.10.8 + 1.10.19 2.5.0 0.5.0 thrift 0.9.3 - 3.4.8 - 1.7.7 + 3.4.9 + 1.7.24 4.0.3 2.4.1 - 1.3.3 - 4.1.1.Final + 1.3.8 + 4.1.9.Final 3.6.2.Final 2.1.11 1.0.18 - 2.11.6 + 2.12.2 1.46 1.0.0-RC2 1.0.0 - 2.11.0 + 2.12.0 2.4 1.8 @@ -1624,11 +1622,6 @@ ${commons-logging.version} - commons-net - commons-net - ${commons-net.version} - - org.apache.commons commons-math ${commons-math.version} -- 2.11.0 (Apple Git-81)