diff --git a/hbase-archetypes/hbase-client-project/pom.xml b/hbase-archetypes/hbase-client-project/pom.xml index afa3609d1ac4..3b64f594ad88 100644 --- a/hbase-archetypes/hbase-client-project/pom.xml +++ b/hbase-archetypes/hbase-client-project/pom.xml @@ -61,10 +61,53 @@ ${project.version} test + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + test + + + com.fasterxml.jackson.core + jackson-annotations + test + + + com.fasterxml.jackson.core + jackson-core + test + + + com.fasterxml.jackson.core + jackson-databind + test + org.apache.hbase hbase-client ${project.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + org.codehaus.jackson + jackson-mapper-asl + test junit diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml b/hbase-archetypes/hbase-shaded-client-project/pom.xml index 79ba74109efc..e56765f6032d 100644 --- a/hbase-archetypes/hbase-shaded-client-project/pom.xml +++ b/hbase-archetypes/hbase-shaded-client-project/pom.xml @@ -61,11 +61,36 @@ ${project.version} test + + org.codehaus.jackson + jackson-mapper-asl + test + org.apache.hbase hbase-shaded-client ${project.version} + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + test + + + com.fasterxml.jackson.core + jackson-annotations + test + + + com.fasterxml.jackson.core + jackson-core + test + + + com.fasterxml.jackson.core + jackson-databind + test + junit junit diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 4456e33eb8fb..3706925e3a9a 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -161,6 +161,10 @@ org.apache.hbase hbase-server + + org.apache.hbase + hbase-rest + org.apache.hbase hbase-thrift @@ -206,5 +210,9 @@ ${project.version} true + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 21a89830726a..26bf67f18a65 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -125,12 +125,64 @@ org.apache.hbase hbase-common + + + org.apache.avro + avro + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase hbase-common test-jar test + + + org.apache.avro + avro + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase @@ -174,8 +226,9 @@ htrace-core - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + provided org.jruby.jcodings @@ -299,6 +352,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -345,6 +406,14 @@ org.codehaus.jackson jackson-xc + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/util/JsonMapper.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/util/JsonMapper.java index 2a9987ce5f5b..66b809b7c9b6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/util/JsonMapper.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/util/JsonMapper.java @@ -18,12 +18,12 @@ */ package org.apache.hadoop.hbase.util; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.Map; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; -import org.codehaus.jackson.map.ObjectMapper; /** * Utility class for converting objects to JSON diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java index 4d20856907ea..5e3fec15391b 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java @@ -27,6 +27,7 @@ import org.junit.Assert; import org.junit.Test; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; @@ -61,7 +62,9 @@ import org.apache.hadoop.hbase.filter.WhileMatchFilter; import org.apache.hadoop.hbase.util.BuilderStyleTest; import org.apache.hadoop.hbase.util.Bytes; -import org.codehaus.jackson.map.ObjectMapper; + +import org.junit.Assert; +import org.junit.Test; import org.junit.experimental.categories.Category; /** diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index fff513f56aec..18f64c5d8a41 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -272,6 +272,31 @@ commons-io compile + + org.codehaus.jackson + jackson-mapper-asl + provided + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + provided + + + com.fasterxml.jackson.core + jackson-annotations + provided + + + com.fasterxml.jackson.core + jackson-core + provided + + + com.fasterxml.jackson.core + jackson-databind + provided + com.google.protobuf protobuf-java @@ -393,10 +418,118 @@ org.apache.hadoop hadoop-common + + + net.java.dev.jets3t + jets3t + + + javax.servlet.jsp + jsp-api + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-json + + + javax.servlet + servlet-api + + + tomcat + jasper-compiler + + + tomcat + jasper-runtime + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-mapreduce-client-core + + + com.sun.jersey.jersey-test-framework + jersey-test-framework-grizzly2 + + + javax.servlet + servlet-api + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-json + + + com.sun.jersey.contribs + jersey-guice + + + com.google.inject + guice + + + com.google.inject.extensions + guice-servlet + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 77ee78705486..2056d39f0b31 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -112,6 +112,26 @@ test-jar test + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + test + + + com.fasterxml.jackson.core + jackson-annotations + test + + + com.fasterxml.jackson.core + jackson-core + test + + + com.fasterxml.jackson.core + jackson-databind + test + org.apache.hbase hbase-common @@ -123,10 +143,46 @@ org.apache.hbase hbase-client + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase hbase-server + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase @@ -153,11 +209,50 @@ org.apache.hbase hbase-rest + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + com.google.protobuf protobuf-java + + org.codehaus.jackson + jackson-mapper-asl + test + @@ -215,10 +310,46 @@ if we can combine these profiles somehow --> org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + @@ -249,60 +380,78 @@ if we can combine these profiles somehow --> profile for building against Hadoop 3.0.x. Activate using: mvn -Dhadoop.profile=3.0 --> - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - 3.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-annotations - - - jdk.tools - jdk.tools - - - - - org.apache.hadoop - hadoop-minicluster - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - + + hadoop-3.0 + + + hadoop.profile + 3.0 + + + + ${hadoop-three.version} + + + + org.apache.hadoop + hadoop-common + + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + + + org.apache.hadoop + hadoop-minicluster + + + org.apache.htrace + htrace-core + + + + + + + + maven-dependency-plugin + + + create-mrapp-generated-classpath + generate-test-resources + + build-classpath + + + + ${project.build.directory}/test-classes/mrapp-generated-classpath + + + + + + compile-protobuf diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index efe73ccf9329..e401e473db88 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -171,6 +171,28 @@ org.apache.hbase hbase-server + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + net.spy @@ -285,6 +307,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index d230bcf88b9f..6ef43dc7cfd2 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -163,6 +163,28 @@ limitations under the License. org.apache.hbase hbase-common + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase @@ -178,12 +200,48 @@ limitations under the License. org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop-two.version} + ${hadoop.version} + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-common - ${hadoop-two.version} + ${hadoop.version} + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + commons-lang diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 5e44a46bf691..65c32ecb7ad1 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -192,22 +192,115 @@ org.apache.hbase hbase-common jar + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase hbase-protocol + + com.fasterxml.jackson.core + jackson-databind + provided + org.apache.hbase hbase-client + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase hbase-shell + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase hbase-server + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase @@ -255,6 +348,11 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-mapper-asl + provided + io.netty @@ -336,6 +434,24 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -346,6 +462,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -396,6 +530,28 @@ org.apache.hadoop hadoop-common + + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java index 717de1764be2..78529c2a03e5 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java @@ -18,6 +18,8 @@ package org.apache.hadoop.hbase; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter; @@ -27,8 +29,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.util.ReflectionUtils; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -221,8 +221,8 @@ private String getHostId(String hostname) throws IOException { if (hosts != null) { // Iterate through the list of hosts, stopping once you've reached the requested hostname. for (JsonNode host : hosts) { - if (host.get("hostname").getTextValue().equals(hostname)) { - hostId = host.get("hostId").getTextValue(); + if (host.get("hostname").textValue().equals(hostname)) { + hostId = host.get("hostId").textValue(); break; } } @@ -271,12 +271,12 @@ private String getRolePropertyValue(String serviceName, String roleType, String if (roles != null) { // Iterate through the list of roles, stopping once the requested one is found. for (JsonNode role : roles) { - if (role.get("hostRef").get("hostId").getTextValue().equals(hostId) && + if (role.get("hostRef").get("hostId").textValue().equals(hostId) && role.get("type") - .getTextValue() + .textValue() .toLowerCase() .equals(roleType.toLowerCase())) { - roleValue = role.get(property).getTextValue(); + roleValue = role.get(property).textValue(); break; } } @@ -305,8 +305,8 @@ private String getServiceName(Service service) throws IOException { if (services != null) { // Iterate through the list of services, stopping once the requested one is found. for (JsonNode serviceEntry : services) { - if (serviceEntry.get("type").getTextValue().equals(service.toString())) { - serviceName = serviceEntry.get("name").getTextValue(); + if (serviceEntry.get("type").textValue().equals(service.toString())) { + serviceName = serviceEntry.get("name").textValue(); break; } } diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index 3209f48ca57f..c9c953ca6897 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -109,6 +109,28 @@ hbase-common ${project.version} tests + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase @@ -119,6 +141,28 @@ org.apache.hbase hbase-common + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase @@ -191,6 +235,68 @@ org.apache.hadoop hadoop-common + + + net.java.dev.jets3t + jets3t + + + javax.servlet.jsp + jsp-api + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-json + + + javax.servlet + servlet-api + + + tomcat + jasper-compiler + + + tomcat + jasper-runtime + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + @@ -213,6 +319,28 @@ org.apache.hadoop hadoop-common + + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index 922600802c47..99789200bff9 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -79,6 +79,28 @@ hbase-common ${project.version} tests + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase @@ -93,6 +115,28 @@ org.apache.hbase hbase-common + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + com.google.guava @@ -152,6 +196,60 @@ org.apache.hadoop hadoop-common + + + net.java.dev.jets3t + jets3t + + + javax.servlet.jsp + jsp-api + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-json + + + javax.servlet + servlet-api + + + tomcat + jasper-compiler + + + tomcat + jasper-runtime + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index f090ecae5d13..af571c7aab26 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -259,6 +259,24 @@ com.sun.jersey jersey-json + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + com.sun.jersey @@ -284,14 +302,6 @@ javax.xml.bind jaxb-api - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-jaxrs - org.mortbay.jetty jetty @@ -312,6 +322,22 @@ org.mortbay.jetty servlet-api-2.5 + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + org.codehaus.jackson @@ -400,10 +426,46 @@ org.apache.hadoop hadoop-mapreduce-client-core test + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -428,10 +490,59 @@ org.apache.hadoop hadoop-mapreduce-client-core test + + + com.google.guava + guava + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + + + org.apache.hadoop + hadoop-annotations + ${hadoop-three.version} org.apache.hadoop hadoop-common + + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableScanResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableScanResource.java index f2c524754b96..a6c6707f1ef1 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableScanResource.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableScanResource.java @@ -18,6 +18,9 @@ */ package org.apache.hadoop.hbase.rest; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; @@ -47,8 +50,6 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.rest.model.CellModel; import org.apache.hadoop.hbase.rest.model.RowModel; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; @InterfaceAudience.Private public class TableScanResource extends ResourceBase { diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java index 214d5749edd7..8b19311933f2 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java @@ -19,6 +19,8 @@ package org.apache.hadoop.hbase.rest.model; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.io.IOException; import java.io.Serializable; @@ -36,7 +38,6 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.rest.ProtobufMessageHandler; import org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell; -import org.codehaus.jackson.annotate.JsonProperty; /** * Representation of a cell. A cell is a single value associated a column and diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java index 5be62a3d0b81..e06e4e75191d 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java @@ -19,6 +19,9 @@ package org.apache.hadoop.hbase.rest.model; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; + import java.io.Serializable; import java.util.LinkedHashMap; import java.util.Map; @@ -31,8 +34,6 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; -import org.codehaus.jackson.annotate.JsonAnyGetter; -import org.codehaus.jackson.annotate.JsonAnySetter; /** * Representation of a column family schema. diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesModel.java index d6a56852b596..161e71500149 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesModel.java @@ -19,6 +19,8 @@ package org.apache.hadoop.hbase.rest.model; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; @@ -34,7 +36,6 @@ import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.rest.ProtobufMessageHandler; import org.apache.hadoop.hbase.rest.protobuf.generated.NamespacesMessage.Namespaces; -import org.codehaus.jackson.annotate.JsonProperty; /** diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/RowModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/RowModel.java index 596c7547af00..8e1156c5cc3d 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/RowModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/RowModel.java @@ -19,6 +19,8 @@ package org.apache.hadoop.hbase.rest.model; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; @@ -32,7 +34,6 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.rest.ProtobufMessageHandler; -import org.codehaus.jackson.annotate.JsonProperty; /** * Representation of a row. A row is a related set of cells, grouped by common diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java index 97d40e4458a4..7ebd7a1390b3 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java @@ -19,6 +19,8 @@ package org.apache.hadoop.hbase.rest.model; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; @@ -560,6 +562,8 @@ public StorageClusterStatusModel() { */ @XmlElement(name = "Node") @XmlElementWrapper(name = "LiveNodes") + // workaround https://github.com/FasterXML/jackson-dataformat-xml/issues/192 + @JsonProperty("LiveNodes") public List getLiveNodes() { return liveNodes; } @@ -569,6 +573,8 @@ public List getLiveNodes() { */ @XmlElement(name = "Node") @XmlElementWrapper(name = "DeadNodes") + // workaround https://github.com/FasterXML/jackson-dataformat-xml/issues/192 + @JsonProperty("DeadNodes") public List getDeadNodes() { return deadNodes; } diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java index 54fc8de9b038..2ed0d5e40cc2 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java @@ -19,8 +19,6 @@ package org.apache.hadoop.hbase.rest.model; -import org.codehaus.jackson.annotate.JsonValue; - import java.io.Serializable; import javax.xml.bind.annotation.XmlRootElement; @@ -28,6 +26,8 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Simple representation of the version of the storage cluster * diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java index 1de0b49f6c9e..07991d763fb2 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java @@ -19,6 +19,10 @@ package org.apache.hadoop.hbase.rest.model; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; + import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; @@ -44,9 +48,6 @@ import org.apache.hadoop.hbase.rest.protobuf.generated.ColumnSchemaMessage.ColumnSchema; import org.apache.hadoop.hbase.rest.protobuf.generated.TableSchemaMessage.TableSchema; import org.apache.hadoop.hbase.util.Bytes; -import org.codehaus.jackson.annotate.JsonAnyGetter; -import org.codehaus.jackson.annotate.JsonAnySetter; -import org.codehaus.jackson.annotate.JsonIgnore; /** * A representation of HBase table descriptors. diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/JacksonProvider.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/JacksonProvider.java index 7791d024ad7a..4e45e76dd9aa 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/JacksonProvider.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/JacksonProvider.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.rest.provider; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import javax.ws.rs.ext.Provider; diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java index 060409eb5b23..59e1e3af4244 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java @@ -19,6 +19,9 @@ import static org.junit.Assert.assertEquals; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; @@ -45,7 +48,7 @@ import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.rest.provider.JacksonProvider; import org.apache.hadoop.hbase.util.Bytes; -import org.codehaus.jackson.map.ObjectMapper; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; 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 53c0ad60e671..8c262c5a7f50 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 @@ -19,6 +19,20 @@ package org.apache.hadoop.hbase.rest; +import static org.junit.Assert.assertEquals; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import javax.ws.rs.core.MediaType; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; + +import org.apache.commons.httpclient.Header; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.Admin; @@ -31,7 +45,7 @@ import org.apache.hadoop.hbase.rest.provider.JacksonProvider; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; -import org.codehaus.jackson.map.ObjectMapper; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -44,9 +58,6 @@ import javax.xml.bind.Unmarshaller; import java.io.IOException; -import static org.junit.Assert.assertEquals; - - @Category(MediumTests.class) public class TestMultiRowResource { diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java index bd76be904211..cf7d3a312366 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java @@ -18,6 +18,8 @@ */ package org.apache.hadoop.hbase.rest; +import com.fasterxml.jackson.databind.ObjectMapper; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; @@ -48,7 +50,6 @@ import org.apache.hadoop.hbase.rest.provider.JacksonProvider; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; -import org.codehaus.jackson.map.ObjectMapper; import static org.junit.Assert.*; diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java index 9fc9301da837..5d034bc555f7 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java @@ -22,6 +22,11 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.ObjectMapper; + import java.io.DataInputStream; import java.io.EOFException; import java.io.IOException; @@ -60,10 +65,6 @@ import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.rest.provider.JacksonProvider; import org.apache.hadoop.hbase.util.Bytes; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -350,7 +351,7 @@ public void testStreamingJSON() throws Exception { count = 0; JsonFactory jfactory = new JsonFactory(mapper); - JsonParser jParser = jfactory.createJsonParser(response.getStream()); + JsonParser jParser = jfactory.createParser(response.getStream()); boolean found = false; while (jParser.nextToken() != JsonToken.END_OBJECT) { if(jParser.getCurrentToken() == JsonToken.START_OBJECT && found) { diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java index cbacc409beac..075764153825 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java @@ -19,6 +19,9 @@ package org.apache.hadoop.hbase.rest; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; + import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java index 293110a63c69..d2d93d8f0a12 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java @@ -18,14 +18,14 @@ package org.apache.hadoop.hbase.rest.model; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import junit.framework.TestCase; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.rest.ProtobufMessageHandler; import org.apache.hadoop.hbase.rest.provider.JAXBContextResolver; import org.apache.hadoop.hbase.util.Base64; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ObjectNode; import org.junit.experimental.categories.Category; import javax.ws.rs.core.MediaType; diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java index f05d79f99a4d..6a0cc60f78c3 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java @@ -47,11 +47,10 @@ public TestScannerModel() throws Exception { + "privatepublic" + ""; - AS_JSON = "{\"batch\":100,\"caching\":1000,\"cacheBlocks\":false,\"endRow\":\"enp5eng=\"," - + "\"endTime\":1245393318192,\"maxVersions\":2147483647,\"startRow\":\"YWJyYWNhZGFicmE=\"," - + "\"startTime\":1245219839331,\"column\":[\"Y29sdW1uMQ==\",\"Y29sdW1uMjpmb28=\"]," - +"\"labels\":[\"private\",\"public\"]" - +"}"; + AS_JSON = "{\"startRow\":\"YWJyYWNhZGFicmE=\",\"endRow\":\"enp5eng=\",\"column\":" + + "[\"Y29sdW1uMQ==\",\"Y29sdW1uMjpmb28=\"],\"batch\":100,\"startTime\":1245219839331," + + "\"endTime\":1245393318192,\"filter\":null,\"maxVersions\":2147483647," + + "\"caching\":1000,\"labels\":[\"private\",\"public\"],\"cacheBlocks\":false}"; AS_PB = "CgthYnJhY2FkYWJyYRIFenp5engaB2NvbHVtbjEaC2NvbHVtbjI6Zm9vIGQo47qL554kMLDi57mf" + "JDj/////B0joB1IHcHJpdmF0ZVIGcHVibGljWAA="; diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 39b6bd92d3df..388ecbbd6878 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -516,17 +516,35 @@ org.mortbay.jetty servlet-api-2.5 - - org.codehaus.jackson - jackson-core-asl - org.codehaus.jackson jackson-mapper-asl + provided org.codehaus.jackson jackson-jaxrs + provided + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + provided + + + com.fasterxml.jackson.core + jackson-annotations + provided + + + com.fasterxml.jackson.core + jackson-core + provided + + + com.fasterxml.jackson.core + jackson-databind + provided tomcat @@ -715,6 +733,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -727,6 +763,24 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -737,17 +791,55 @@ org.apache.hadoop hadoop-hdfs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-hdfs test-jar test + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster test + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + @@ -800,6 +892,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/AgeSnapshot.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/AgeSnapshot.java index 4c1ad23e46c0..c2eaf4a6fbe9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/AgeSnapshot.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/AgeSnapshot.java @@ -17,8 +17,9 @@ */ package org.apache.hadoop.hbase.io.hfile; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import org.apache.hadoop.hbase.util.FastLongHistogram; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; /** * Snapshot of block cache age in cache. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java index 89f73eb13676..f1b6dfa1ab7c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java @@ -17,6 +17,11 @@ */ package org.apache.hadoop.hbase.io.hfile; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import java.io.IOException; import java.util.NavigableMap; import java.util.NavigableSet; @@ -26,11 +31,6 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.util.FastLongHistogram; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; /** * Utilty for aggregating counts in CachedBlocks and toString/toJSON CachedBlocks and BlockCaches. @@ -43,9 +43,9 @@ public class BlockCacheUtil { */ private static final ObjectMapper MAPPER = new ObjectMapper(); static { - MAPPER.configure(SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS, false); - MAPPER.configure(SerializationConfig.Feature.FLUSH_AFTER_WRITE_VALUE, true); - MAPPER.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); + MAPPER.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); + MAPPER.configure(SerializationFeature.FLUSH_AFTER_WRITE_VALUE, true); + MAPPER.configure(SerializationFeature.INDENT_OUTPUT, true); } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java index ef1ab8511dc9..b6617d81b09f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java @@ -18,6 +18,11 @@ */ package org.apache.hadoop.hbase.io.hfile; +import static java.util.Objects.requireNonNull; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.lang.ref.WeakReference; import java.nio.ByteBuffer; import java.util.EnumMap; @@ -46,7 +51,6 @@ import org.apache.hadoop.hbase.util.ClassSize; import org.apache.hadoop.hbase.util.HasThread; import org.apache.hadoop.util.StringUtils; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java index a6c84d0a490b..4e04c9872523 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java @@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.io.hfile.bucket; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.Arrays; import java.util.Comparator; import java.util.HashSet; @@ -37,7 +38,6 @@ import org.apache.hadoop.hbase.io.hfile.BlockCacheKey; import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache.BucketEntry; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; import com.google.common.base.Objects; import com.google.common.base.Preconditions; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java index f5b694fd43b0..cdd86636be03 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java @@ -20,6 +20,17 @@ import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.google.protobuf.BlockingService; +import com.google.protobuf.CodedInputStream; +import com.google.protobuf.CodedOutputStream; +import com.google.protobuf.Descriptors.MethodDescriptor; +import com.google.protobuf.Message; +import com.google.protobuf.ServiceException; +import com.google.protobuf.TextFormat; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -134,19 +145,8 @@ import org.apache.hadoop.security.token.SecretManager.InvalidToken; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.util.StringUtils; -import org.codehaus.jackson.map.ObjectMapper; import org.apache.htrace.TraceInfo; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.google.protobuf.BlockingService; -import com.google.protobuf.CodedInputStream; -import com.google.protobuf.CodedOutputStream; -import com.google.protobuf.Descriptors.MethodDescriptor; -import com.google.protobuf.Message; -import com.google.protobuf.ServiceException; -import com.google.protobuf.TextFormat; - /** * An RPC server that hosts protobuf described Services. * diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredTaskImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredTaskImpl.java index 4f373c4bdfd9..7174b3f8413a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredTaskImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredTaskImpl.java @@ -18,8 +18,8 @@ */ package org.apache.hadoop.hbase.monitoring; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.codehaus.jackson.map.ObjectMapper; import java.io.IOException; import java.util.ArrayList; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java index 63eaa4371d20..898464a41205 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java @@ -43,7 +43,6 @@ import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.wal.WALPrettyPrinter; -import org.codehaus.jackson.map.ObjectMapper; /** * HLogPrettyPrinter prints the contents of a given HLog with a variety of diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java index 7b5aa541a6b6..79c510d32360 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java @@ -16,6 +16,10 @@ */ package org.apache.hadoop.hbase.util; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; + +import java.io.BufferedWriter; import java.io.Closeable; import java.io.IOException; import java.io.PrintWriter; @@ -43,9 +47,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.JsonGenerator; /** * Utility for doing JSON and MBeans. @@ -62,14 +63,14 @@ public JSONBean() { * Use dumping out mbeans as JSON. */ public interface Writer extends Closeable { - void write(final String key, final String value) throws JsonGenerationException, IOException; + void write(final String key, final String value) throws IOException; int write(final MBeanServer mBeanServer, ObjectName qry, String attribute, final boolean description) throws IOException; void flush() throws IOException; } public Writer open(final PrintWriter writer) throws IOException { - final JsonGenerator jg = jsonFactory.createJsonGenerator(writer); + final JsonGenerator jg = jsonFactory.createGenerator(writer); jg.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); jg.useDefaultPrettyPrinter(); jg.writeStartObject(); @@ -85,7 +86,7 @@ public void close() throws IOException { } @Override - public void write(String key, String value) throws JsonGenerationException, IOException { + public void write(String key, String value) throws IOException { jg.writeStringField(key, value); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALPrettyPrinter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALPrettyPrinter.java index 33522a8faeee..182c985847ac 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALPrettyPrinter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALPrettyPrinter.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hbase.wal; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintStream; @@ -45,7 +46,6 @@ import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; -import org.codehaus.jackson.map.ObjectMapper; import org.apache.hadoop.hbase.regionserver.wal.ProtobufLogReader; // imports for things that haven't moved yet. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java index c2418e87d2e2..932f65567bfe 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -18,8 +18,8 @@ */ package org.apache.hadoop.hbase; -import static org.codehaus.jackson.map.SerializationConfig.Feature.SORT_PROPERTIES_ALPHABETICALLY; - +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.io.PrintStream; import java.lang.reflect.Constructor; @@ -96,7 +96,6 @@ import org.apache.hadoop.mapreduce.lib.reduce.LongSumReducer; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.codehaus.jackson.map.ObjectMapper; import com.yammer.metrics.core.Histogram; import com.yammer.metrics.stats.UniformSample; @@ -128,7 +127,7 @@ public class PerformanceEvaluation extends Configured implements Tool { private static final Log LOG = LogFactory.getLog(PerformanceEvaluation.class.getName()); private static final ObjectMapper MAPPER = new ObjectMapper(); static { - MAPPER.configure(SORT_PROPERTIES_ALPHABETICALLY, true); + MAPPER.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true); } public static final String TABLE_NAME = "TestTable"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java index cade7a433241..394c9d835408 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java @@ -20,20 +20,18 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.Test; import org.junit.experimental.categories.Category; @Category(SmallTests.class) public class TestPerformanceEvaluation { + @Test - public void testSerialization() - throws JsonGenerationException, JsonMappingException, IOException { + public void testSerialization() throws IOException { PerformanceEvaluation.TestOptions options = new PerformanceEvaluation.TestOptions(); assertTrue(!options.isAutoFlush()); options.setAutoFlush(true); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java index 3b9161cddff3..8d605712f6b6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java @@ -31,8 +31,6 @@ import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.hfile.TestCacheConfig.DataCacheEntry; import org.apache.hadoop.hbase.io.hfile.TestCacheConfig.IndexCacheEntry; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -76,7 +74,7 @@ private void addDataAndHits(final BlockCache bc, final int count) { } @Test - public void testBucketCache() throws JsonGenerationException, JsonMappingException, IOException { + public void testBucketCache() throws IOException { this.conf.set(HConstants.BUCKET_CACHE_IOENGINE_KEY, "offheap"); this.conf.setInt(HConstants.BUCKET_CACHE_SIZE_KEY, 100); CacheConfig cc = new CacheConfig(this.conf); @@ -94,7 +92,7 @@ public void testBucketCache() throws JsonGenerationException, JsonMappingExcepti } @Test - public void testLruBlockCache() throws JsonGenerationException, JsonMappingException, IOException { + public void testLruBlockCache() throws IOException { CacheConfig cc = new CacheConfig(this.conf); assertTrue(cc.isBlockCacheEnabled()); assertTrue(CacheConfig.DEFAULT_IN_MEMORY == cc.isInMemory()); @@ -123,8 +121,7 @@ private void bucketCacheReport(final BlockCache bc) { } } - private void logPerFile(final BlockCacheUtil.CachedBlocksByFile cbsbf) - throws JsonGenerationException, JsonMappingException, IOException { + private void logPerFile(final BlockCacheUtil.CachedBlocksByFile cbsbf) throws IOException { for (Map.Entry> e: cbsbf.getCachedBlockStatsByFile().entrySet()) { int count = 0; @@ -146,8 +143,7 @@ private void logPerFile(final BlockCacheUtil.CachedBlocksByFile cbsbf) } } - private BlockCacheUtil.CachedBlocksByFile logPerBlock(final BlockCache bc) - throws JsonGenerationException, JsonMappingException, IOException { + private BlockCacheUtil.CachedBlocksByFile logPerBlock(final BlockCache bc) throws IOException { BlockCacheUtil.CachedBlocksByFile cbsbf = new BlockCacheUtil.CachedBlocksByFile(); for (CachedBlock cb: bc) { LOG.info(cb.toString()); diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml index 3ee73ed4c45b..6b8972261791 100644 --- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml +++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml @@ -38,11 +38,39 @@ org.apache.hbase hbase-shaded-client ${project.version} + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.apache.hbase hbase-shaded-server ${project.version} + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index 8a3016b44c74..bd8fc2e30356 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -56,6 +56,30 @@ javax.xml.bind jaxb-api + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + diff --git a/hbase-shaded/hbase-shaded-server/pom.xml b/hbase-shaded/hbase-shaded-server/pom.xml index 672627048d12..4c9dc58785f1 100644 --- a/hbase-shaded/hbase-shaded-server/pom.xml +++ b/hbase-shaded/hbase-shaded-server/pom.xml @@ -154,6 +154,38 @@ org.glassfish.jersey.media jersey-media-json-jackson1 + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 90d924ba6609..bc88806c6cf8 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -184,10 +184,6 @@ - - org.codehaus - org.apache.hadoop.hbase.shaded.org.codehaus - org.jcodings org.apache.hadoop.hbase.shaded.org.jcodings diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index ca42997457dd..dd049939d177 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -196,6 +196,24 @@ org.apache.hbase hbase-common + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase @@ -207,9 +225,52 @@ org.apache.hbase hbase-protocol + + org.codehaus.jackson + jackson-mapper-asl + test + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + provided + + + com.fasterxml.jackson.core + jackson-annotations + provided + + + com.fasterxml.jackson.core + jackson-core + provided + + + com.fasterxml.jackson.core + jackson-databind + provided + org.apache.hbase hbase-client + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase @@ -219,6 +280,24 @@ org.apache.hbase hbase-server + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase @@ -327,6 +406,24 @@ org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -339,6 +436,24 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -349,17 +464,47 @@ org.apache.hadoop hadoop-hdfs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-hdfs test-jar test + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster test + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -409,10 +554,50 @@ org.apache.hadoop hadoop-common + + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster + + + org.apache.htrace + htrace-core + + + com.google.guava + guava + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index f6b1084a215b..1b60b7ebe626 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -47,12 +47,56 @@ hbase-common jar compile + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase hbase-common test-jar compile + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase @@ -77,18 +121,72 @@ hbase-client jar compile + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase hbase-server jar compile + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase hbase-server test-jar compile + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase @@ -141,6 +239,24 @@ org.apache.hadoop hadoop-core compile + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -187,6 +303,24 @@ org.apache.hadoop hadoop-common compile + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -197,6 +331,16 @@ org.apache.hadoop hadoop-client compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -218,11 +362,31 @@ hadoop-hdfs test-jar compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -250,11 +414,47 @@ org.apache.hadoop hadoop-common compile + + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster compile + + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 40d91556d5a3..93e89a67a2cc 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -226,6 +226,26 @@ hbase-common jar + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + test + + + com.fasterxml.jackson.core + jackson-annotations + test + + + com.fasterxml.jackson.core + jackson-core + test + + + com.fasterxml.jackson.core + jackson-databind + test + org.apache.hbase hbase-annotations @@ -239,6 +259,24 @@ org.apache.hbase hbase-client + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + com.google.guava @@ -271,6 +309,24 @@ org.apache.hbase hbase-server + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + org.apache.hbase @@ -333,6 +389,11 @@ jasper-runtime compile + + org.codehaus.jackson + jackson-mapper-asl + test + @@ -558,6 +619,24 @@ the same time. --> org.apache.hadoop hadoop-mapreduce-client-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop @@ -568,11 +647,39 @@ the same time. --> org.apache.hadoop hadoop-common + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster test + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + @@ -619,10 +726,46 @@ the same time. --> org.apache.hadoop hadoop-common + + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop hadoop-minicluster + + + org.apache.htrace + htrace-core + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + diff --git a/pom.xml b/pom.xml index c4b00c3e91a7..ba6f1a1d1f22 100644 --- a/pom.xml +++ b/pom.xml @@ -1268,7 +1268,9 @@ 3.1 2.2.0 12.0.1 - 1.9.13 + 1.9.13 + 2.9.9 + 2.9.9.2 5.5.23 2.2.2 6.1.26 @@ -1298,7 +1300,7 @@ 2.11.6 1.46 - 2.5 + 3.1.1 1.6 2.4.1 1.3.9-1 @@ -1713,22 +1715,42 @@ org.codehaus.jackson jackson-core-asl - ${jackson.version} + ${jackson1.version} org.codehaus.jackson jackson-mapper-asl - ${jackson.version} + ${jackson1.version} org.codehaus.jackson jackson-jaxrs - ${jackson.version} + ${jackson1.version} org.codehaus.jackson jackson-xc - ${jackson.version} + ${jackson1.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson2.databind.version}