diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index a66be01..db4fb78 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -273,6 +273,10 @@ org.apache.httpcomponents httpclient + commons-lang commons-lang @@ -405,6 +409,12 @@ org.apache.hadoop hadoop-common + + + commons-httpclient + commons-httpclient + + org.apache.hadoop diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java index e26de63..353d427 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java @@ -19,30 +19,36 @@ package org.apache.hadoop.hbase.rest.client; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.httpclient.Header; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpMethod; -import org.apache.commons.httpclient.HttpVersion; -import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; -import org.apache.commons.httpclient.URI; -import org.apache.commons.httpclient.methods.ByteArrayRequestEntity; -import org.apache.commons.httpclient.methods.DeleteMethod; -import org.apache.commons.httpclient.methods.GetMethod; -import org.apache.commons.httpclient.methods.HeadMethod; -import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.commons.httpclient.methods.PutMethod; -import org.apache.commons.httpclient.params.HttpClientParams; -import org.apache.commons.httpclient.params.HttpConnectionManagerParams; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.http.Header; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpHead; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.entity.InputStreamEntity; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicHeader; +import org.apache.http.params.CoreConnectionPNames; +import org.apache.http.params.HttpParams; +//import org.apache.commons.httpclient.methods.ByteArrayRequestEntity; /** * A wrapper around HttpClient which provides some useful function and @@ -71,17 +77,17 @@ public class Client { private void initialize(Cluster cluster, boolean sslEnabled) { this.cluster = cluster; this.sslEnabled = sslEnabled; - MultiThreadedHttpConnectionManager manager = - new MultiThreadedHttpConnectionManager(); - HttpConnectionManagerParams managerParams = manager.getParams(); - managerParams.setConnectionTimeout(2000); // 2 s + extraHeaders = new ConcurrentHashMap(); + String clspath = System.getProperty("java.class.path"); + LOG.info("classpath " + clspath); + this.httpClient = new DefaultHttpClient(); + //this.httpClient.getParams().setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 2000); + /* managerParams.setDefaultMaxConnectionsPerHost(10); managerParams.setMaxTotalConnections(100); - extraHeaders = new ConcurrentHashMap(); - this.httpClient = new HttpClient(manager); - HttpClientParams clientParams = httpClient.getParams(); - clientParams.setVersion(HttpVersion.HTTP_1_1); - + HttpParams clientParams = httpClient.getParams(); + // clientParams.setVersion( HttpVersion.HTTP_1_1); + */ } /** * Constructor @@ -104,9 +110,6 @@ public class Client { * Shut down the client. Close any open persistent connections. */ public void shutdown() { - MultiThreadedHttpConnectionManager manager = - (MultiThreadedHttpConnectionManager) httpClient.getHttpConnectionManager(); - manager.shutdown(); } /** @@ -159,7 +162,7 @@ public class Client { * @return the HTTP response code * @throws IOException */ - public int executePathOnly(Cluster cluster, HttpMethod method, + public HttpResponse executePathOnly(Cluster cluster, HttpUriRequest method, Header[] headers, String path) throws IOException { IOException lastException; if (cluster.nodes.size() < 1) { @@ -178,10 +181,17 @@ public class Client { } sb.append(cluster.lastHost); sb.append(path); - URI uri = new URI(sb.toString(), true); + URI uri = new URI(sb.toString()); + if (method instanceof HttpPut) { + method = new HttpPut(uri); + } else if (method instanceof HttpGet) { + method = new HttpGet(uri); + } return executeURI(method, headers, uri.toString()); } catch (IOException e) { lastException = e; + } catch (URISyntaxException use) { + lastException = new IOException(use); } } while (++i != start && i < cluster.nodes.size()); throw lastException; @@ -195,25 +205,26 @@ public class Client { * @return the HTTP response code * @throws IOException */ - public int executeURI(HttpMethod method, Header[] headers, String uri) + public HttpResponse executeURI(HttpUriRequest method, Header[] headers, String uri) throws IOException { - method.setURI(new URI(uri, true)); + // method.setURI(new URI(uri, true)); for (Map.Entry e: extraHeaders.entrySet()) { - method.addRequestHeader(e.getKey(), e.getValue()); + method.addHeader(e.getKey(), e.getValue()); } if (headers != null) { for (Header header: headers) { - method.addRequestHeader(header); + method.addHeader(header); } } long startTime = System.currentTimeMillis(); - int code = httpClient.executeMethod(method); + HttpResponse resp; + resp = httpClient.execute(method); long endTime = System.currentTimeMillis(); if (LOG.isTraceEnabled()) { - LOG.trace(method.getName() + " " + uri + " " + code + " " + - method.getStatusText() + " in " + (endTime - startTime) + " ms"); + LOG.trace(method.getMethod() + " " + uri + " " + resp.getStatusLine().getStatusCode() + " " + + resp.getStatusLine().getReasonPhrase() + " in " + (endTime - startTime) + " ms"); } - return code; + return resp; } /** @@ -227,7 +238,7 @@ public class Client { * @return the HTTP response code * @throws IOException */ - public int execute(Cluster cluster, HttpMethod method, Header[] headers, + public HttpResponse execute(Cluster cluster, HttpUriRequest method, Header[] headers, String path) throws IOException { if (path.startsWith("/")) { return executePathOnly(cluster, method, headers, path); @@ -269,11 +280,11 @@ public class Client { */ public Response head(Cluster cluster, String path, Header[] headers) throws IOException { - HeadMethod method = new HeadMethod(); + HttpHead method = new HttpHead(path); try { - int code = execute(cluster, method, null, path); - headers = method.getResponseHeaders(); - return new Response(code, headers, null); + HttpResponse resp = execute(cluster, method, null, path); + // headers = method.getResponseHeaders(); + return new Response(resp.getStatusLine().getStatusCode(), resp.getAllHeaders(), null); } finally { method.releaseConnection(); } @@ -322,7 +333,7 @@ public class Client { public Response get(Cluster cluster, String path, String accept) throws IOException { Header[] headers = new Header[1]; - headers[0] = new Header("Accept", accept); + headers[0] = new BasicHeader("Accept", accept); return get(cluster, path, headers); } @@ -339,6 +350,43 @@ public class Client { } /** + * Returns the response body of the HTTPResponse, if any, as an array of bytes. + * If response body is not available or cannot be read, returns null + * + * Note: This will cause the entire response body to be buffered in memory. A + * malicious server may easily exhaust all the VM memory. It is strongly + * recommended, to use getResponseAsStream if the content length of the response + * is unknown or reasonably large. + * + * @param resp HttpResponse + * @return The response body + * @throws IOException If an I/O (transport) problem occurs while obtaining the + * response body. + */ + public static byte[] getResponseBody(HttpResponse resp) throws IOException { + try(InputStream instream = resp.getEntity().getContent()) { + if (instream != null) { + long contentLength = resp.getEntity().getContentLength(); + if (contentLength > Integer.MAX_VALUE) { + //guard integer cast from overflow + throw new IOException("Content too large to be buffered: " + + contentLength +" bytes"); + } + ByteArrayOutputStream outstream = new ByteArrayOutputStream( + contentLength > 0 ? (int) contentLength : 4*1024); + byte[] buffer = new byte[4096]; + int len; + while ((len = instream.read(buffer)) > 0) { + outstream.write(buffer, 0, len); + } + outstream.close(); + return outstream.toByteArray(); + } + return null; + } + } + + /** * Send a GET request * @param c the cluster definition * @param path the path or URI @@ -348,13 +396,11 @@ public class Client { */ public Response get(Cluster c, String path, Header[] headers) throws IOException { - GetMethod method = new GetMethod(); + HttpGet method = new HttpGet(path); try { - int code = execute(c, method, headers, path); - headers = method.getResponseHeaders(); - byte[] body = method.getResponseBody(); - InputStream in = method.getResponseBodyAsStream(); - return new Response(code, headers, body, in); + HttpResponse resp = execute(c, method, headers, path); + return new Response(resp.getStatusLine().getStatusCode(), resp.getAllHeaders(), + getResponseBody(resp), resp.getEntity().getContent()); } finally { method.releaseConnection(); } @@ -399,7 +445,7 @@ public class Client { public Response put(Cluster cluster, String path, String contentType, byte[] content) throws IOException { Header[] headers = new Header[1]; - headers[0] = new Header("Content-Type", contentType); + headers[0] = new BasicHeader("Content-Type", contentType); return put(cluster, path, headers, content); } @@ -417,7 +463,7 @@ public class Client { byte[] content, Header extraHdr) throws IOException { int cnt = extraHdr == null ? 1 : 2; Header[] headers = new Header[cnt]; - headers[0] = new Header("Content-Type", contentType); + headers[0] = new BasicHeader("Content-Type", contentType); if (extraHdr != null) { headers[1] = extraHdr; } @@ -450,13 +496,13 @@ public class Client { */ public Response put(Cluster cluster, String path, Header[] headers, byte[] content) throws IOException { - PutMethod method = new PutMethod(); + HttpPut method = new HttpPut(path); try { - method.setRequestEntity(new ByteArrayRequestEntity(content)); - int code = execute(cluster, method, headers, path); - headers = method.getResponseHeaders(); - content = method.getResponseBody(); - return new Response(code, headers, content); + method.setEntity(new InputStreamEntity(new ByteArrayInputStream(content), content.length)); + HttpResponse resp = execute(cluster, method, headers, path); + headers = resp.getAllHeaders(); + content = getResponseBody(resp); + return new Response(resp.getStatusLine().getStatusCode(), headers, content); } finally { method.releaseConnection(); } @@ -501,7 +547,7 @@ public class Client { public Response post(Cluster cluster, String path, String contentType, byte[] content) throws IOException { Header[] headers = new Header[1]; - headers[0] = new Header("Content-Type", contentType); + headers[0] = new BasicHeader("Content-Type", contentType); return post(cluster, path, headers, content); } @@ -519,7 +565,7 @@ public class Client { byte[] content, Header extraHdr) throws IOException { int cnt = extraHdr == null ? 1 : 2; Header[] headers = new Header[cnt]; - headers[0] = new Header("Content-Type", contentType); + headers[0] = new BasicHeader("Content-Type", contentType); if (extraHdr != null) { headers[1] = extraHdr; } @@ -552,13 +598,13 @@ public class Client { */ public Response post(Cluster cluster, String path, Header[] headers, byte[] content) throws IOException { - PostMethod method = new PostMethod(); + HttpPost method = new HttpPost(path); try { - method.setRequestEntity(new ByteArrayRequestEntity(content)); - int code = execute(cluster, method, headers, path); - headers = method.getResponseHeaders(); - content = method.getResponseBody(); - return new Response(code, headers, content); + method.setEntity(new InputStreamEntity(new ByteArrayInputStream(content), content.length)); + HttpResponse resp = execute(cluster, method, headers, path); + headers = resp.getAllHeaders(); + content = getResponseBody(resp); + return new Response(resp.getStatusLine().getStatusCode(), resp.getAllHeaders(), content); } finally { method.releaseConnection(); } @@ -593,12 +639,12 @@ public class Client { * @throws IOException for error */ public Response delete(Cluster cluster, String path) throws IOException { - DeleteMethod method = new DeleteMethod(); + HttpDelete method = new HttpDelete(path); try { - int code = execute(cluster, method, null, path); - Header[] headers = method.getResponseHeaders(); - byte[] content = method.getResponseBody(); - return new Response(code, headers, content); + HttpResponse resp = execute(cluster, method, null, path); + Header[] headers = resp.getAllHeaders(); + byte[] content = getResponseBody(resp); + return new Response(resp.getStatusLine().getStatusCode(), headers, content); } finally { method.releaseConnection(); } @@ -612,13 +658,13 @@ public class Client { * @throws IOException for error */ public Response delete(Cluster cluster, String path, Header extraHdr) throws IOException { - DeleteMethod method = new DeleteMethod(); + HttpDelete method = new HttpDelete(path); try { Header[] headers = { extraHdr }; - int code = execute(cluster, method, headers, path); - headers = method.getResponseHeaders(); - byte[] content = method.getResponseBody(); - return new Response(code, headers, content); + HttpResponse resp = execute(cluster, method, headers, path); + headers = resp.getAllHeaders(); + byte[] content = getResponseBody(resp); + return new Response(resp.getStatusLine().getStatusCode(), headers, content); } finally { method.releaseConnection(); } diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java index 871b646..01d4ab5 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java @@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.rest.client; import java.io.InputStream; -import org.apache.commons.httpclient.Header; +import org.apache.http.Header; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java index c6fb2ff..d6eb1b3 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java @@ -24,14 +24,12 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; import java.net.URLEncoder; -import java.util.Dictionary; import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.xml.bind.JAXBException; -import org.apache.commons.httpclient.Header; +import org.apache.http.Header; import org.apache.hadoop.hbase.CompatibilityFactory; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.rest.client.Response; diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java index 42d355d..5097454 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java @@ -27,7 +27,8 @@ import java.io.ByteArrayOutputStream; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import org.apache.commons.httpclient.Header; +import org.apache.http.Header; +import org.apache.http.message.BasicHeader; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; @@ -95,8 +96,8 @@ public class TestGzipFilter { // input side filter Header[] headers = new Header[2]; - headers[0] = new Header("Content-Type", Constants.MIMETYPE_BINARY); - headers[1] = new Header("Content-Encoding", "gzip"); + headers[0] = new BasicHeader("Content-Type", Constants.MIMETYPE_BINARY); + headers[1] = new BasicHeader("Content-Encoding", "gzip"); Response response = client.put(path, headers, value_1_gzip); assertEquals(response.getCode(), 200); @@ -110,8 +111,8 @@ public class TestGzipFilter { // output side filter - headers[0] = new Header("Accept", Constants.MIMETYPE_BINARY); - headers[1] = new Header("Accept-Encoding", "gzip"); + headers[0] = new BasicHeader("Accept", Constants.MIMETYPE_BINARY); + headers[1] = new BasicHeader("Accept-Encoding", "gzip"); response = client.get(path, headers); assertEquals(response.getCode(), 200); ByteArrayInputStream bis = new ByteArrayInputStream(response.getBody()); @@ -128,8 +129,8 @@ public class TestGzipFilter { @Test public void testErrorNotGzipped() throws Exception { Header[] headers = new Header[2]; - headers[0] = new Header("Accept", Constants.MIMETYPE_BINARY); - headers[1] = new Header("Accept-Encoding", "gzip"); + headers[0] = new BasicHeader("Accept", Constants.MIMETYPE_BINARY); + headers[1] = new BasicHeader("Accept-Encoding", "gzip"); Response response = client.get("/" + TABLE + "/" + ROW_1 + "/" + COLUMN_2, headers); assertEquals(response.getCode(), 404); String contentEncoding = response.getHeader("Content-Encoding"); @@ -142,9 +143,9 @@ public class TestGzipFilter { void testScannerResultCodes() throws Exception { Header[] headers = new Header[3]; - headers[0] = new Header("Content-Type", Constants.MIMETYPE_XML); - headers[1] = new Header("Accept", Constants.MIMETYPE_JSON); - headers[2] = new Header("Accept-Encoding", "gzip"); + headers[0] = new BasicHeader("Content-Type", Constants.MIMETYPE_XML); + headers[1] = new BasicHeader("Accept", Constants.MIMETYPE_JSON); + headers[2] = new BasicHeader("Accept-Encoding", "gzip"); Response response = client.post("/" + TABLE + "/scanner", headers, "".getBytes()); assertEquals(response.getCode(), 201); diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java index 958cb15..84d1855 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java @@ -18,7 +18,8 @@ */ package org.apache.hadoop.hbase.rest; -import org.apache.commons.httpclient.Header; +import org.apache.http.Header; +import org.apache.http.message.BasicHeader; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.Admin; @@ -96,7 +97,7 @@ public class TestMultiRowResource { public static void setUpBeforeClass() throws Exception { conf = TEST_UTIL.getConfiguration(); conf.setBoolean(RESTServer.REST_CSRF_ENABLED_KEY, csrfEnabled); - extraHdr = new Header(RESTServer.REST_CSRF_CUSTOM_HEADER_DEFAULT, ""); + extraHdr = new BasicHeader(RESTServer.REST_CSRF_CUSTOM_HEADER_DEFAULT, ""); TEST_UTIL.startMiniCluster(); REST_TEST_UTIL.startServletContainer(conf); context = JAXBContext.newInstance( diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java index 5114b11..be7ee9a 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java @@ -37,7 +37,7 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; -import org.apache.commons.httpclient.Header; +import org.apache.http.Header; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java index d005445..19fdaf0 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java @@ -28,7 +28,8 @@ import java.util.List; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import org.apache.commons.httpclient.Header; +import org.apache.http.Header; +import org.apache.http.message.BasicHeader; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; @@ -86,7 +87,7 @@ public class TestSchemaResource { public static void setUpBeforeClass() throws Exception { conf = TEST_UTIL.getConfiguration(); conf.setBoolean(RESTServer.REST_CSRF_ENABLED_KEY, csrfEnabled); - extraHdr = new Header(RESTServer.REST_CSRF_CUSTOM_HEADER_DEFAULT, ""); + extraHdr = new BasicHeader(RESTServer.REST_CSRF_CUSTOM_HEADER_DEFAULT, ""); TEST_UTIL.startMiniCluster(); REST_TEST_UTIL.startServletContainer(conf); client = new Client(new Cluster().add("localhost", diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java index 19d0587..1ac37fa 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java @@ -30,7 +30,8 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.commons.httpclient.Header; +import org.apache.http.Header; +import org.apache.http.message.BasicHeader; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; @@ -513,16 +514,16 @@ public class TestRemoteTable { Response response = new Response(200); assertEquals(200, response.getCode()); Header[] headers = new Header[2]; - headers[0] = new Header("header1", "value1"); - headers[1] = new Header("header2", "value2"); + headers[0] = new BasicHeader("header1", "value1"); + headers[1] = new BasicHeader("header2", "value2"); response = new Response(200, headers); assertEquals("value1", response.getHeader("header1")); assertFalse(response.hasBody()); response.setCode(404); assertEquals(404, response.getCode()); headers = new Header[2]; - headers[0] = new Header("header1", "value1.1"); - headers[1] = new Header("header2", "value2"); + headers[0] = new BasicHeader("header1", "value1.1"); + headers[1] = new BasicHeader("header2", "value2"); response.setHeaders(headers); assertEquals("value1.1", response.getHeader("header1")); response.setBody(Bytes.toBytes("body")); diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 0e8116c..68e3591 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -566,6 +566,10 @@ esapi 2.1.0.1 + + commons-httpclient + commons-httpclient + xercesImpl xerces diff --git a/pom.xml b/pom.xml index ea7743f..4dc3f49 100644 --- a/pom.xml +++ b/pom.xml @@ -1254,7 +1254,7 @@ 3.3.0 3.2.2 - 4.3.6 + 4.4.4 4.4.4 3.1.2 12.0.1 @@ -2194,6 +2194,10 @@ hadoop-common ${hadoop-two.version} + + commons-httpclient + commons-httpclient + javax.servlet.jsp jsp-api @@ -2224,6 +2228,10 @@ hadoop-minicluster ${hadoop-two.version} + + commons-httpclient + commons-httpclient + javax.servlet.jsp jsp-api @@ -2360,6 +2368,10 @@ hadoop-common ${hadoop-three.version} + + commons-httpclient + commons-httpclient + javax.servlet.jsp jsp-api @@ -2395,6 +2407,10 @@ hadoop-minicluster ${hadoop-three.version} + + commons-httpclient + commons-httpclient + javax.servlet.jsp jsp-api