From 91a6ed82b307d0693763d5e3a11bdd3eb200fca8 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sun, 28 Jul 2019 14:28:39 +0530 Subject: [PATCH 1/2] HBASE-22728 : jackson dependency cleanup --- hbase-client/pom.xml | 29 +++++ hbase-common/pom.xml | 25 +++- hbase-examples/pom.xml | 83 ++++++++++++- hbase-external-blockcache/pom.xml | 18 +++ hbase-hadoop2-compat/pom.xml | 36 ++++++ hbase-it/pom.xml | 57 +++++++++ hbase-prefix-tree/pom.xml | 32 +++++ hbase-procedure/pom.xml | 8 ++ hbase-rest/pom.xml | 114 ++++++++++++++++-- .../hadoop/hbase/rest/TableScanResource.java | 7 +- .../hadoop/hbase/rest/model/CellModel.java | 2 +- .../hbase/rest/model/ColumnSchemaModel.java | 4 +- .../hbase/rest/model/NamespacesModel.java | 2 +- .../hadoop/hbase/rest/model/RowModel.java | 2 +- .../rest/model/StorageClusterStatusModel.java | 5 + .../model/StorageClusterVersionModel.java | 3 - .../hbase/rest/model/TableSchemaModel.java | 7 +- .../hbase/rest/provider/JacksonProvider.java | 3 +- .../hadoop/hbase/rest/RowResourceBase.java | 4 +- .../hbase/rest/TestMultiRowResource.java | 5 +- .../rest/TestNamespacesInstanceResource.java | 2 +- .../hadoop/hbase/rest/TestTableScan.java | 10 +- .../hbase/rest/TestVersionResource.java | 4 +- .../hbase/rest/model/TestModelBase.java | 6 +- .../hbase/rest/model/TestScannerModel.java | 9 +- hbase-rsgroup/pom.xml | 47 ++++++++ hbase-server/pom.xml | 80 +++++++++++- .../hbase-shaded-check-invariants/pom.xml | 28 +++++ hbase-shaded/hbase-shaded-client/pom.xml | 8 ++ hbase-shaded/hbase-shaded-server/pom.xml | 16 +++ .../hbase-shaded-testing-util/pom.xml | 68 +++++++++++ hbase-shaded/pom.xml | 4 - hbase-shell/pom.xml | 95 +++++++++++++++ hbase-testing-util/pom.xml | 90 ++++++++++++++ hbase-thrift/pom.xml | 75 ++++++++++++ pom.xml | 32 ++++- 36 files changed, 954 insertions(+), 66 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 01e334ab43..ee8e24bc5b 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -125,12 +125,24 @@ org.apache.hbase hbase-common + + + org.apache.avro + avro + + org.apache.hbase hbase-common test-jar test + + + org.apache.avro + avro + + org.apache.hbase @@ -176,6 +188,7 @@ org.codehaus.jackson jackson-mapper-asl + provided org.jruby.jcodings @@ -282,6 +295,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -332,6 +353,14 @@ org.codehaus.jackson jackson-xc + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index b16d2031e9..0ad7d6fe63 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -272,6 +272,11 @@ commons-io compile + + org.codehaus.jackson + jackson-mapper-asl + provided + com.google.protobuf protobuf-java @@ -286,10 +291,6 @@ htrace-core - - org.apache.avro - avro - @@ -399,6 +400,14 @@ tomcat jasper-runtime + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -449,6 +458,14 @@ 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 9e9409be10..3ce37ef654 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -153,11 +153,34 @@ 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.google.protobuf protobuf-java + + org.codehaus.jackson + jackson-mapper-asl + test + @@ -191,10 +214,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 + + @@ -241,10 +300,26 @@ if we can combine these profiles somehow --> org.apache.hadoop hadoop-common - - org.apache.htrace - htrace-core - + + 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-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index 3710dec696..9065994e4d 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -240,6 +240,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 0ab428d8a4..b41e135ffd 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -183,11 +183,47 @@ limitations under the License. org.apache.hadoop hadoop-mapreduce-client-core ${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.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 87fe7c73e0..028b97f64a 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -255,6 +255,11 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-mapper-asl + provided + io.netty @@ -333,6 +338,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 @@ -343,6 +366,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 @@ -398,6 +439,22 @@ 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-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index 8f4221ec35..06aa6e9423 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -206,6 +206,22 @@ 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 + @@ -234,6 +250,22 @@ 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 82fc77cd8a..2e67fc52a8 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -165,6 +165,14 @@ 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 09a72b30a1..a28ea0c58a 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,26 @@ org.mortbay.jetty servlet-api-2.5 + + 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.codehaus.jackson @@ -400,10 +430,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 @@ -436,6 +502,22 @@ 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 + @@ -451,6 +533,22 @@ 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-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 b1f7eaccda..660157dffd 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 @@ -23,12 +23,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; @@ -38,6 +35,8 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; @@ -47,8 +46,6 @@ import org.apache.hadoop.hbase.client.Result; 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 214d5749ed..7e3ab8889b 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 @@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.CellUtil; @@ -36,7 +37,6 @@ import org.apache.hadoop.hbase.KeyValue; 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 5be62a3d0b..b4ec70bd69 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 @@ -28,11 +28,11 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.namespace.QName; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; 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 d6a56852b5..8985175da0 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 @@ -29,12 +29,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.classification.InterfaceAudience; 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 596c7547af..41fc0ec025 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 @@ -30,9 +30,9 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.fasterxml.jackson.annotation.JsonProperty; 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 97d40e4458..64edd341b1 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 @@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -560,6 +561,8 @@ public class 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 +572,8 @@ public class StorageClusterStatusModel */ @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 bf163f2cfc..e21df52f42 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,13 +19,10 @@ package org.apache.hadoop.hbase.rest.model; -import org.codehaus.jackson.annotate.JsonValue; - import java.io.Serializable; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlValue; import org.apache.hadoop.hbase.classification.InterfaceAudience; 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 1de0b49f6c..77d08d60a1 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 @@ -44,9 +44,10 @@ import org.apache.hadoop.hbase.rest.ProtobufMessageHandler; 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; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.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 7791d024ad..a53293272b 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,10 +17,11 @@ */ package org.apache.hadoop.hbase.rest.provider; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; import javax.ws.rs.ext.Provider; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; + //create a class in the defined resource package name //so it gets activated //Use jackson to take care of json 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 9da9761717..1f1da4d39f 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 @@ -30,6 +30,8 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -44,8 +46,6 @@ import org.apache.hadoop.hbase.rest.model.CellSetModel; 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.jaxrs.JacksonJaxbJsonProvider; -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 4a72afcf2f..962be0162f 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 @@ -28,6 +28,9 @@ import java.util.List; import javax.ws.rs.core.MediaType; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import org.apache.commons.httpclient.Header; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; @@ -44,8 +47,6 @@ import org.apache.hadoop.hbase.rest.model.RowModel; 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.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; 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 bd76be9042..6af506399b 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 @@ -31,6 +31,7 @@ import javax.ws.rs.core.MediaType; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -48,7 +49,6 @@ import org.apache.hadoop.hbase.rest.model.TestNamespacesInstanceModel; 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 0c7d6d8189..e101aff184 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 @@ -44,6 +44,10 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.parsers.SAXParserFactory; import javax.xml.stream.XMLStreamException; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -62,10 +66,6 @@ import org.apache.hadoop.hbase.rest.model.CellSetModel; 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; @@ -357,7 +357,7 @@ public class TestTableScan { 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 03c462e6d1..4d7248c1eb 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 @@ -26,6 +26,8 @@ import javax.ws.rs.core.MediaType; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; @@ -39,8 +41,6 @@ import org.apache.hadoop.hbase.util.Bytes; import static org.junit.Assert.*; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; 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 ad3a667a22..9b65266f9d 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 80f8764118..705a552867 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 class TestScannerModel extends TestModelBase { + "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-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index bab5dc3867..4a0b06157e 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -124,6 +124,16 @@ org.apache.hbase hbase-client + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + org.apache.hbase @@ -147,6 +157,11 @@ hbase-testing-util test + + org.codehaus.jackson + jackson-mapper-asl + provided + @@ -206,6 +221,22 @@ 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 + @@ -235,6 +266,22 @@ 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 + diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 71dd9d045e..0de00d8c76 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -524,17 +524,15 @@ 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 tomcat @@ -700,6 +698,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 @@ -712,6 +728,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 @@ -722,12 +756,32 @@ 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 @@ -790,6 +844,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-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml index 1acbb86b32..d1bfdd288c 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 06e897a623..30001b28ee 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -56,6 +56,14 @@ javax.xml.bind jaxb-api + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + diff --git a/hbase-shaded/hbase-shaded-server/pom.xml b/hbase-shaded/hbase-shaded-server/pom.xml index 8a7d931ca9..5393590445 100644 --- a/hbase-shaded/hbase-shaded-server/pom.xml +++ b/hbase-shaded/hbase-shaded-server/pom.xml @@ -154,6 +154,22 @@ 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 + diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml index 06ea3b41d0..a1efc7d4e6 100644 --- a/hbase-shaded/hbase-shaded-testing-util/pom.xml +++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml @@ -39,18 +39,68 @@ hadoop-hdfs test-jar compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + org.apache.hbase hbase-common test-jar compile + + + org.apache.avro + avro + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hbase hbase-server test-jar compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + org.apache.hbase @@ -70,6 +120,24 @@ hbase-testing-util ${project.version} compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index ed87764b72..0f30d9fa44 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -189,10 +189,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 8a78aecfbd..f5f4ebd969 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -207,6 +207,11 @@ org.apache.hbase hbase-protocol + + org.codehaus.jackson + jackson-mapper-asl + provided + org.apache.hbase hbase-client @@ -319,6 +324,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 @@ -331,6 +354,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 @@ -341,17 +382,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 @@ -406,6 +477,22 @@ 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 + @@ -420,6 +507,14 @@ com.google.guava guava + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index 413453a67e..2ecd562b47 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -140,6 +140,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 @@ -155,6 +173,24 @@ org.apache.hadoop hadoop-mapreduce-client-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 @@ -165,17 +201,47 @@ org.apache.hadoop hadoop-hdfs compile + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + org.apache.hadoop 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 @@ -208,6 +274,22 @@ 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 + @@ -219,6 +301,14 @@ org.apache.htrace htrace-core + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 36dadac574..8e2ca8058a 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -333,6 +333,11 @@ jasper-runtime compile + + org.codehaus.jackson + jackson-mapper-asl + test + @@ -512,6 +517,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 @@ -522,11 +545,39 @@ 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 + + @@ -578,6 +629,22 @@ 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 + @@ -588,6 +655,14 @@ 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 5570a9d5b0..074a961e9d 100644 --- a/pom.xml +++ b/pom.xml @@ -1278,7 +1278,9 @@ 4.4.4 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 @@ -1776,22 +1778,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}