1) Move up to Jackson 2.1

2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(

client/pom.xml

@@ -18,7 +18,8 @@
   ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.metamx.druid</groupId>
     <artifactId>druid-client</artifactId>
@@ -106,20 +107,20 @@
             <artifactId>icu4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs</artifactId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-smile</artifactId>
+            <artifactId>jackson-dataformat-smile</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>

client/src/main/java/com/metamx/druid/BaseNode.java

@@ -19,9 +19,10 @@
 
 package com.metamx.druid;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.metamx.common.lifecycle.Lifecycle;
 import com.metamx.common.logger.Logger;
-import org.codehaus.jackson.map.ObjectMapper;
+
 import org.skife.config.ConfigurationObjectFactory;
 
 import java.util.Properties;

client/src/main/java/com/metamx/druid/BaseQuery.java

@@ -19,13 +19,14 @@
 
 package com.metamx.druid;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.metamx.common.guava.Sequence;
 import com.metamx.druid.query.QueryRunner;
 import com.metamx.druid.query.segment.QuerySegmentSpec;
 import com.metamx.druid.query.segment.QuerySegmentWalker;
-import org.codehaus.jackson.annotate.JsonProperty;
+
 import org.joda.time.Duration;
 import org.joda.time.Interval;
 

client/src/main/java/com/metamx/druid/Query.java

@@ -19,6 +19,8 @@
 
 package com.metamx.druid;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.metamx.common.guava.Sequence;
 import com.metamx.druid.query.QueryRunner;
 import com.metamx.druid.query.group.GroupByQuery;
@@ -28,8 +30,8 @@ import com.metamx.druid.query.segment.QuerySegmentSpec;
 import com.metamx.druid.query.segment.QuerySegmentWalker;
 import com.metamx.druid.query.timeboundary.TimeBoundaryQuery;
 import com.metamx.druid.query.timeseries.TimeseriesQuery;
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
 import org.joda.time.Duration;
 import org.joda.time.Interval;
 

client/src/main/java/com/metamx/druid/QueryableNode.java

@@ -19,6 +19,9 @@
 
 package com.metamx.druid;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.NamedType;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
@@ -47,9 +50,9 @@ import com.metamx.metrics.MonitorSchedulerConfig;
 import com.metamx.metrics.SysMonitor;
 import com.metamx.phonebook.PhoneBook;
 import org.I0Itec.zkclient.ZkClient;
-import org.codehaus.jackson.map.ObjectMapper;
+
-import org.codehaus.jackson.map.jsontype.NamedType;
+
-import org.codehaus.jackson.smile.SmileFactory;
+
 import org.mortbay.jetty.Server;
 import org.skife.config.ConfigurationObjectFactory;
 

client/src/main/java/com/metamx/druid/RegisteringNode.java

@@ -19,8 +19,9 @@
 
 package com.metamx.druid;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.metamx.druid.index.v1.serde.Registererer;
-import org.codehaus.jackson.map.ObjectMapper;
+
 
 import java.util.Arrays;
 import java.util.List;

client/src/main/java/com/metamx/druid/client/BrokerServerView.java

@@ -19,6 +19,7 @@
 
 package com.metamx.druid.client;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
@@ -28,7 +29,7 @@ import com.metamx.druid.client.selector.ServerSelector;
 import com.metamx.druid.query.QueryRunner;
 import com.metamx.druid.query.QueryToolChestWarehouse;
 import com.metamx.http.client.HttpClient;
-import org.codehaus.jackson.map.ObjectMapper;
+
 
 import javax.annotation.Nullable;
 import java.util.Iterator;

client/src/main/java/com/metamx/druid/client/CachingClusteredClient.java

@@ -19,6 +19,8 @@
 
 package com.metamx.druid.client;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
@@ -53,8 +55,8 @@ import com.metamx.druid.query.segment.MultipleSpecificSegmentSpec;
 import com.metamx.druid.query.segment.SegmentDescriptor;
 import com.metamx.druid.result.BySegmentResultValueClass;
 import com.metamx.druid.result.Result;
-import org.codehaus.jackson.map.ObjectMapper;
+
-import org.codehaus.jackson.type.TypeReference;
+
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 

client/src/main/java/com/metamx/druid/client/DataSegment.java

@@ -19,6 +19,10 @@
 
 package com.metamx.druid.client;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
@@ -31,10 +35,10 @@ import com.metamx.druid.jackson.CommaListJoinSerializer;
 import com.metamx.druid.query.segment.SegmentDescriptor;
 import com.metamx.druid.shard.NoneShardSpec;
 import com.metamx.druid.shard.ShardSpec;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
-import org.codehaus.jackson.map.annotate.JsonDeserialize;
+
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 

client/src/main/java/com/metamx/druid/client/DirectDruidClient.java

@@ -19,6 +19,13 @@
 
 package com.metamx.druid.client;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.ObjectCodec;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import com.google.common.io.Closeables;
@@ -40,13 +47,12 @@ import com.metamx.http.client.HttpClient;
 import com.metamx.http.client.io.AppendableByteArrayInputStream;
 import com.metamx.http.client.response.ClientResponse;
 import com.metamx.http.client.response.InputStreamResponseHandler;
-import org.codehaus.jackson.JsonParser;
+
-import org.codehaus.jackson.JsonToken;
+
-import org.codehaus.jackson.ObjectCodec;
+
-import org.codehaus.jackson.map.ObjectMapper;
+
-import org.codehaus.jackson.map.type.TypeFactory;
+
-import org.codehaus.jackson.smile.SmileFactory;
+
-import org.codehaus.jackson.type.JavaType;
 import org.jboss.netty.handler.codec.http.HttpChunk;
 import org.jboss.netty.handler.codec.http.HttpHeaders;
 import org.jboss.netty.handler.codec.http.HttpResponse;

client/src/main/java/com/metamx/druid/client/DruidDataSource.java

@@ -19,8 +19,9 @@
 
 package com.metamx.druid.client;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Maps;
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.Collections;
 import java.util.Map;

client/src/main/java/com/metamx/druid/client/DruidServer.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.client;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 import com.metamx.common.logger.Logger;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.HashMap;
 import java.util.Map;

client/src/main/java/com/metamx/druid/client/ZKPhoneBook.java

@@ -19,6 +19,7 @@
 
 package com.metamx.druid.client;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Joiner;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Maps;
@@ -33,7 +34,7 @@ import org.I0Itec.zkclient.IZkChildListener;
 import org.I0Itec.zkclient.ZkClient;
 import org.I0Itec.zkclient.exception.ZkNoNodeException;
 import org.I0Itec.zkclient.exception.ZkNodeExistsException;
-import org.codehaus.jackson.map.ObjectMapper;
+
 
 import java.io.IOException;
 import java.util.Arrays;

client/src/main/java/com/metamx/druid/http/BrokerNode.java

@@ -19,6 +19,8 @@
 
 package com.metamx.druid.http;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.inject.Guice;
@@ -53,8 +55,8 @@ import com.metamx.http.client.HttpClientInit;
 import com.metamx.metrics.Monitor;
 import com.netflix.curator.framework.CuratorFramework;
 import com.netflix.curator.x.discovery.ServiceDiscovery;
-import org.codehaus.jackson.map.ObjectMapper;
+
-import org.codehaus.jackson.smile.SmileFactory;
+
 import org.mortbay.jetty.servlet.Context;
 import org.mortbay.jetty.servlet.ServletHolder;
 import org.skife.config.ConfigurationObjectFactory;

client/src/main/java/com/metamx/druid/http/ClientServletModule.java

@@ -19,13 +19,15 @@
 
 package com.metamx.druid.http;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.google.inject.Provides;
 import com.metamx.druid.client.ClientInventoryManager;
 import com.metamx.druid.query.segment.QuerySegmentWalker;
 import com.sun.jersey.guice.JerseyServletModule;
 import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
-import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
+
-import org.codehaus.jackson.map.ObjectMapper;
+
 
 import javax.inject.Singleton;
 

client/src/main/java/com/metamx/druid/http/QueryServlet.java

@@ -19,6 +19,8 @@
 
 package com.metamx.druid.http;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.ByteStreams;
@@ -31,8 +33,8 @@ import com.metamx.druid.query.segment.QuerySegmentWalker;
 import com.metamx.emitter.service.AlertEvent;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceMetricEvent;
-import org.codehaus.jackson.map.ObjectMapper;
+
-import org.codehaus.jackson.map.ObjectWriter;
+
 import org.joda.time.DateTime;
 import org.mortbay.jetty.Request;
 

client/src/main/java/com/metamx/druid/initialization/Initialization.java

@@ -19,6 +19,7 @@
 
 package com.metamx.druid.initialization;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Throwables;
 import com.google.common.io.Closeables;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -41,7 +42,7 @@ import com.netflix.curator.x.discovery.ServiceInstance;
 import com.netflix.curator.x.discovery.ServiceProvider;
 import org.I0Itec.zkclient.ZkClient;
 import org.I0Itec.zkclient.ZkConnection;
-import org.codehaus.jackson.map.ObjectMapper;
+
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.nio.SelectChannelConnector;

client/src/main/java/com/metamx/druid/merge/ClientAppendQuery.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.merge;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.client.DataSegment;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.List;
 

client/src/main/java/com/metamx/druid/merge/ClientDefaultMergeQuery.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.merge;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.aggregation.AggregatorFactory;
 import com.metamx.druid.client.DataSegment;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.List;
 

client/src/main/java/com/metamx/druid/merge/ClientDeleteQuery.java

@@ -19,8 +19,10 @@
 
 package com.metamx.druid.merge;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.Interval;
 
 public class ClientDeleteQuery

client/src/main/java/com/metamx/druid/merge/ClientMergeQuery.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.merge;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.metamx.druid.client.DataSegment;
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
 
 import java.util.List;
 

client/src/main/java/com/metamx/druid/query/CacheStrategy.java

@@ -19,10 +19,11 @@
 
 package com.metamx.druid.query;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Function;
 import com.metamx.common.guava.Sequence;
 import com.metamx.druid.Query;
-import org.codehaus.jackson.type.TypeReference;
+
 
 /**
 */

client/src/main/java/com/metamx/druid/query/QueryToolChest.java

@@ -19,11 +19,12 @@
 
 package com.metamx.druid.query;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Function;
 import com.metamx.common.guava.Sequence;
 import com.metamx.druid.Query;
 import com.metamx.emitter.service.ServiceMetricEvent;
-import org.codehaus.jackson.type.TypeReference;
+
 
 /**
  * The broker-side (also used by server in some cases) API for a specific Query type.  This API is still undergoing

client/src/main/java/com/metamx/druid/query/dimension/DefaultDimensionSpec.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.dimension;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.query.extraction.DimExtractionFn;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 

client/src/main/java/com/metamx/druid/query/dimension/DimensionSpec.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.dimension;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.metamx.druid.query.extraction.DimExtractionFn;
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
 
 /**
  */

client/src/main/java/com/metamx/druid/query/dimension/ExtractionDimensionSpec.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.dimension;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.query.extraction.DimExtractionFn;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 

client/src/main/java/com/metamx/druid/query/dimension/LegacyDimensionSpec.java

@@ -19,8 +19,9 @@
 
 package com.metamx.druid.query.dimension;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.metamx.common.IAE;
-import org.codehaus.jackson.annotate.JsonCreator;
+
 
 import java.util.Map;
 

client/src/main/java/com/metamx/druid/query/extraction/DimExtractionFn.java

@@ -19,8 +19,9 @@
 
 package com.metamx.druid.query.extraction;
 
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 /**
  */

client/src/main/java/com/metamx/druid/query/extraction/PartialDimExtractionFn.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.query.extraction;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.nio.ByteBuffer;
 import java.util.regex.Matcher;

client/src/main/java/com/metamx/druid/query/extraction/RegexDimExtractionFn.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.query.extraction;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.nio.ByteBuffer;
 import java.util.regex.Matcher;

client/src/main/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFn.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.extraction;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.query.search.SearchQuerySpec;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 

client/src/main/java/com/metamx/druid/query/extraction/TimeDimExtractionFn.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.extraction;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ibm.icu.text.SimpleDateFormat;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 import java.text.ParseException;

client/src/main/java/com/metamx/druid/query/filter/AndDimFilter.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.filter;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Joiner;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.List;
 

client/src/main/java/com/metamx/druid/query/filter/DimFilter.java

@@ -19,8 +19,9 @@
 
 package com.metamx.druid.query.filter;
 
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 /**
  */

client/src/main/java/com/metamx/druid/query/filter/ExtractionDimFilter.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.filter;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.query.extraction.DimExtractionFn;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 

client/src/main/java/com/metamx/druid/query/filter/NotDimFilter.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.query.filter;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.nio.ByteBuffer;
 

client/src/main/java/com/metamx/druid/query/filter/OrDimFilter.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.filter;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Joiner;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.List;
 

client/src/main/java/com/metamx/druid/query/filter/RegexDimFilter.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.filter;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Charsets;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 

client/src/main/java/com/metamx/druid/query/filter/SearchQueryDimFilter.java

@@ -19,9 +19,10 @@
 
 package com.metamx.druid.query.filter;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Charsets;
 import com.metamx.druid.query.search.SearchQuerySpec;
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 

client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.query.filter;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.nio.ByteBuffer;
 

client/src/main/java/com/metamx/druid/query/group/GroupByQuery.java

@@ -19,6 +19,8 @@
 
 package com.metamx.druid.query.group;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -33,8 +35,8 @@ import com.metamx.druid.query.dimension.DimensionSpec;
 import com.metamx.druid.query.filter.DimFilter;
 import com.metamx.druid.query.segment.LegacySegmentSpec;
 import com.metamx.druid.query.segment.QuerySegmentSpec;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.List;
 import java.util.Map;

client/src/main/java/com/metamx/druid/query/group/GroupByQueryQueryToolChest.java

@@ -19,6 +19,7 @@
 
 package com.metamx.druid.query.group;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Joiner;
@@ -43,7 +44,7 @@ import com.metamx.druid.query.QueryToolChest;
 import com.metamx.druid.query.dimension.DimensionSpec;
 import com.metamx.druid.utils.PropUtils;
 import com.metamx.emitter.service.ServiceMetricEvent;
-import org.codehaus.jackson.type.TypeReference;
+
 import org.joda.time.Interval;
 import org.joda.time.Minutes;
 

client/src/main/java/com/metamx/druid/query/metadata/ColumnAnalysis.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.query.metadata;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.metamx.druid.index.column.ValueType;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 /**
 */

client/src/main/java/com/metamx/druid/query/metadata/ColumnIncluderator.java

@@ -19,8 +19,9 @@
 
 package com.metamx.druid.query.metadata;
 
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 /**
  */

client/src/main/java/com/metamx/druid/query/metadata/ListColumnIncluderator.java

@@ -19,12 +19,14 @@
 
 package com.metamx.druid.query.metadata;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Charsets;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

client/src/main/java/com/metamx/druid/query/metadata/SegmentAnalysis.java

@@ -19,8 +19,10 @@
 
 package com.metamx.druid.query.metadata;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.Interval;
 
 import java.util.List;

client/src/main/java/com/metamx/druid/query/metadata/SegmentMetadataQuery.java

@@ -19,10 +19,11 @@
 
 package com.metamx.druid.query.metadata;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.BaseQuery;
 import com.metamx.druid.Query;
 import com.metamx.druid.query.segment.QuerySegmentSpec;
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.Map;
 

client/src/main/java/com/metamx/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java

@@ -19,6 +19,7 @@
 
 package com.metamx.druid.query.metadata;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Joiner;
@@ -39,7 +40,7 @@ import com.metamx.druid.query.QueryToolChest;
 import com.metamx.druid.query.ResultMergeQueryRunner;
 import com.metamx.druid.utils.JodaUtils;
 import com.metamx.emitter.service.ServiceMetricEvent;
-import org.codehaus.jackson.type.TypeReference;
+
 import org.joda.time.Interval;
 import org.joda.time.Minutes;
 

client/src/main/java/com/metamx/druid/query/search/FragmentSearchQuerySpec.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.query.search;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 import java.util.List;

client/src/main/java/com/metamx/druid/query/search/InsensitiveContainsSearchQuerySpec.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.query.search;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.nio.ByteBuffer;
 

client/src/main/java/com/metamx/druid/query/search/LexicographicSearchSortSpec.java

@@ -19,7 +19,9 @@
 
 package com.metamx.druid.query.search;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
 
 import java.util.Comparator;
 import java.util.Map;

client/src/main/java/com/metamx/druid/query/search/SearchHit.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.query.search;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

client/src/main/java/com/metamx/druid/query/search/SearchQuery.java

@@ -19,6 +19,8 @@
 
 package com.metamx.druid.query.search;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
@@ -29,8 +31,8 @@ import com.metamx.druid.query.filter.DimFilter;
 import com.metamx.druid.query.segment.QuerySegmentSpec;
 import com.metamx.druid.result.Result;
 import com.metamx.druid.result.SearchResultValue;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import javax.annotation.Nullable;
 import java.util.List;

client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java

@@ -19,6 +19,7 @@
 
 package com.metamx.druid.query.search;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Joiner;
@@ -49,7 +50,7 @@ import com.metamx.druid.result.Result;
 import com.metamx.druid.result.SearchResultValue;
 import com.metamx.druid.utils.PropUtils;
 import com.metamx.emitter.service.ServiceMetricEvent;
-import org.codehaus.jackson.type.TypeReference;
+
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.joda.time.Minutes;

client/src/main/java/com/metamx/druid/query/search/SearchQuerySpec.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.query.search;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.google.common.base.Predicate;
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
 
 import java.util.List;
 

client/src/main/java/com/metamx/druid/query/search/SearchSortSpec.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.query.search;
 
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.util.Comparator;
 

client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java

@@ -19,10 +19,11 @@
 
 package com.metamx.druid.query.segment;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import com.metamx.common.IAE;
-import org.codehaus.jackson.annotate.JsonCreator;
+
 import org.joda.time.Interval;
 
 import java.util.Arrays;

client/src/main/java/com/metamx/druid/query/segment/MultipleIntervalSegmentSpec.java

@@ -19,11 +19,13 @@
 
 package com.metamx.druid.query.segment;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.Query;
 import com.metamx.druid.query.QueryRunner;
 import com.metamx.druid.utils.JodaUtils;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 import org.joda.time.Interval;
 
 import java.util.Collections;

client/src/main/java/com/metamx/druid/query/segment/MultipleSpecificSegmentSpec.java

@@ -19,13 +19,15 @@
 
 package com.metamx.druid.query.segment;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.metamx.druid.Query;
 import com.metamx.druid.query.QueryRunner;
 import com.metamx.druid.utils.JodaUtils;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 import org.joda.time.Interval;
 
 import java.util.List;

client/src/main/java/com/metamx/druid/query/segment/QuerySegmentSpec.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.query.segment;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.metamx.druid.Query;
 import com.metamx.druid.query.QueryRunner;
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
 import org.joda.time.Interval;
 
 import java.util.List;

client/src/main/java/com/metamx/druid/query/segment/SegmentDescriptor.java

@@ -19,8 +19,10 @@
 
 package com.metamx.druid.query.segment;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.Interval;
 
 /**

client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java

@@ -19,6 +19,8 @@
 
 package com.metamx.druid.query.timeboundary;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -28,8 +30,8 @@ import com.metamx.druid.query.segment.MultipleIntervalSegmentSpec;
 import com.metamx.druid.query.segment.QuerySegmentSpec;
 import com.metamx.druid.result.Result;
 import com.metamx.druid.result.TimeBoundaryResultValue;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 

client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java

@@ -19,6 +19,7 @@
 
 package com.metamx.druid.query.timeboundary;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.collect.Lists;
@@ -36,7 +37,7 @@ import com.metamx.druid.query.QueryToolChest;
 import com.metamx.druid.result.Result;
 import com.metamx.druid.result.TimeBoundaryResultValue;
 import com.metamx.emitter.service.ServiceMetricEvent;
-import org.codehaus.jackson.type.TypeReference;
+
 import org.joda.time.DateTime;
 
 import javax.annotation.Nullable;

client/src/main/java/com/metamx/druid/query/timeseries/TimeseriesQuery.java

@@ -19,6 +19,9 @@
 
 package com.metamx.druid.query.timeseries;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.metamx.druid.BaseQuery;
@@ -31,10 +34,10 @@ import com.metamx.druid.query.filter.DimFilter;
 import com.metamx.druid.query.segment.QuerySegmentSpec;
 import com.metamx.druid.result.Result;
 import com.metamx.druid.result.TimeseriesResultValue;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeName;
+
 
 import java.util.List;
 import java.util.Map;

client/src/main/java/com/metamx/druid/query/timeseries/TimeseriesQueryQueryToolChest.java

@@ -19,6 +19,7 @@
 
 package com.metamx.druid.query.timeseries;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -45,7 +46,7 @@ import com.metamx.druid.query.filter.DimFilter;
 import com.metamx.druid.result.Result;
 import com.metamx.druid.result.TimeseriesResultValue;
 import com.metamx.emitter.service.ServiceMetricEvent;
-import org.codehaus.jackson.type.TypeReference;
+
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.joda.time.Minutes;

client/src/main/java/com/metamx/druid/result/BySegmentResultValueClass.java

@@ -19,7 +19,8 @@
 
 package com.metamx.druid.result;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.Interval;
 
 import java.util.List;

client/src/main/java/com/metamx/druid/result/BySegmentSearchResultValue.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.result;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.metamx.druid.query.search.SearchHit;
-import org.codehaus.jackson.annotate.JsonProperty;
+
-import org.codehaus.jackson.annotate.JsonValue;
+
 
 import java.util.List;
 

client/src/main/java/com/metamx/druid/result/MetricValueExtractor.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.result;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonValue;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 import java.lang.Double;import java.lang.Float;import java.lang.Long;import java.lang.Number;import java.lang.Object;import java.lang.Override;import java.lang.String;import java.util.Map;
 

client/src/main/java/com/metamx/druid/result/Result.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.result;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
-import org.codehaus.jackson.annotate.JsonUnwrapped;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.DateTime;
 
 /**

client/src/main/java/com/metamx/druid/result/SearchResultValue.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.result;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.metamx.druid.query.search.SearchHit;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonValue;
+
 
 import java.util.Iterator;
 import java.util.List;

client/src/main/java/com/metamx/druid/result/TimeBoundaryResultValue.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.result;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.metamx.common.IAE;
 import com.metamx.druid.query.timeboundary.TimeBoundaryQuery;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonValue;
+
 import org.joda.time.DateTime;
 
 import java.util.Map;

client/src/main/java/com/metamx/druid/result/TimeseriesResultValue.java

@@ -19,7 +19,9 @@
 
 package com.metamx.druid.result;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
 
 import java.util.Map;
 

client/src/main/java/com/metamx/druid/shard/LinearShardSpec.java

@@ -1,9 +1,10 @@
 package com.metamx.druid.shard;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.input.InputRow;
 import com.metamx.druid.partition.LinearPartitionChunk;
 import com.metamx.druid.partition.PartitionChunk;
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.Map;
 

client/src/main/java/com/metamx/druid/shard/NoneShardSpec.java

@@ -22,7 +22,7 @@ package com.metamx.druid.shard;
 import com.metamx.druid.input.InputRow;
 import com.metamx.druid.partition.PartitionChunk;
 import com.metamx.druid.partition.SingleElementPartitionChunk;
-import org.codehaus.jackson.annotate.JsonTypeName;
+
 
 import java.util.Map;
 

client/src/main/java/com/metamx/druid/shard/ShardSpec.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.shard;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.metamx.druid.input.InputRow;
 import com.metamx.druid.partition.PartitionChunk;
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
 
 import java.util.Map;
 

client/src/main/java/com/metamx/druid/shard/SingleDimensionShardSpec.java

@@ -19,11 +19,12 @@
 
 package com.metamx.druid.shard;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.druid.input.InputRow;
 import com.metamx.druid.partition.PartitionChunk;
 import com.metamx.druid.partition.StringPartitionChunk;
-import org.codehaus.jackson.annotate.JsonProperty;
+
-import org.codehaus.jackson.annotate.JsonTypeName;
+
 
 import java.util.List;
 import java.util.Map;

client/src/test/java/com/metamx/druid/client/DataSegmentTest.java

@@ -19,6 +19,8 @@
 
 package com.metamx.druid.client;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -27,8 +29,8 @@ import com.metamx.druid.index.v1.IndexIO;
 import com.metamx.druid.jackson.DefaultObjectMapper;
 import com.metamx.druid.shard.NoneShardSpec;
 import com.metamx.druid.shard.SingleDimensionShardSpec;
-import org.codehaus.jackson.map.ObjectMapper;
+
-import org.codehaus.jackson.type.TypeReference;
+
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.junit.Assert;

client/src/test/java/com/metamx/druid/query/QuerySegmentSpecTest.java

@@ -19,6 +19,7 @@
 
 package com.metamx.druid.query;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.metamx.druid.jackson.DefaultObjectMapper;
@@ -27,7 +28,7 @@ import com.metamx.druid.query.segment.MultipleIntervalSegmentSpec;
 import com.metamx.druid.query.segment.MultipleSpecificSegmentSpec;
 import com.metamx.druid.query.segment.QuerySegmentSpec;
 import com.metamx.druid.query.segment.SegmentDescriptor;
-import org.codehaus.jackson.map.ObjectMapper;
+
 import org.joda.time.Interval;
 import org.junit.Assert;
 import org.junit.Test;

common/pom.xml

@@ -18,7 +18,8 @@
   ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.metamx.druid</groupId>
     <artifactId>druid-common</artifactId>
@@ -72,12 +73,16 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jdbi</groupId>

common/src/main/java/com/metamx/druid/DurationGranularity.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.primitives.Longs;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 import org.joda.time.DateTime;
 
 import java.nio.ByteBuffer;

common/src/main/java/com/metamx/druid/PeriodGranularity.java

@@ -19,8 +19,10 @@
 
 package com.metamx.druid;
 
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.Chronology;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;

common/src/main/java/com/metamx/druid/QueryGranularity.java

@@ -19,10 +19,13 @@
 
 package com.metamx.druid;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.metamx.common.IAE;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
 import org.joda.time.DateTime;
 import org.joda.time.ReadableDuration;
 

common/src/main/java/com/metamx/druid/aggregation/AggregatorFactory.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.metamx.druid.processing.MetricSelectorFactory;
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
 
 import java.util.Comparator;
 import java.util.List;

common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java

@@ -19,11 +19,13 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Longs;
 import com.metamx.druid.processing.MetricSelectorFactory;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.Comparator;
 import java.util.List;

common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.primitives.Doubles;
 import com.metamx.druid.processing.MetricSelectorFactory;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

common/src/main/java/com/metamx/druid/aggregation/Histogram.java

@@ -19,11 +19,12 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
-import org.codehaus.jackson.annotate.JsonValue;
+
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java

@@ -19,13 +19,15 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Charsets;
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Longs;
 import com.metamx.druid.processing.MetricSelectorFactory;
 import org.apache.commons.codec.binary.Base64;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

common/src/main/java/com/metamx/druid/aggregation/HistogramVisual.java

@@ -19,16 +19,19 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.Arrays;
 
 public class HistogramVisual
 {
   @JsonProperty final public double[] breaks;
-  @JsonProperty final public double[] counts;
+  @JsonProperty
+  final public double[] counts;
   // an array of the quantiles including the min. and max.
   @JsonProperty final public double[] quantiles;
 

common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java

@@ -19,14 +19,16 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Doubles;
 import com.metamx.common.IAE;
 import com.metamx.druid.processing.FloatMetricSelector;
 import com.metamx.druid.processing.MetricSelectorFactory;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Function;
 import org.mozilla.javascript.Script;

common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.primitives.Longs;
 import com.metamx.druid.processing.MetricSelectorFactory;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.primitives.Doubles;
 import com.metamx.druid.processing.MetricSelectorFactory;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.aggregation;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.primitives.Doubles;
 import com.metamx.druid.processing.MetricSelectorFactory;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java

@@ -19,11 +19,13 @@
 
 package com.metamx.druid.aggregation.post;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.metamx.common.IAE;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.Comparator;
 import java.util.Iterator;

common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java

@@ -19,9 +19,11 @@
 
 package com.metamx.druid.aggregation.post;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Sets;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.Comparator;
 import java.util.Map;

common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java

@@ -19,10 +19,12 @@
 
 package com.metamx.druid.aggregation.post;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Sets;
 import com.metamx.common.ISE;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 import java.util.Comparator;
 import java.util.Map;

common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.aggregation.post;
 
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.util.Comparator;
 import java.util.Map;

common/src/main/java/com/metamx/druid/db/DbConnectorConfig.java

@@ -19,7 +19,8 @@
 
 package com.metamx.druid.db;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.skife.config.Config;
 
 /**

common/src/main/java/com/metamx/druid/input/MapBasedRow.java

@@ -19,13 +19,15 @@
 
 package com.metamx.druid.input;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.metamx.common.IAE;
 import com.metamx.common.exception.FormattedException;
-import org.codehaus.jackson.annotate.JsonCreator;
+
-import org.codehaus.jackson.annotate.JsonProperty;
+
 import org.joda.time.DateTime;
 
 import javax.annotation.Nullable;

common/src/main/java/com/metamx/druid/input/Row.java

@@ -19,8 +19,11 @@
 
 package com.metamx.druid.input;
 
-import org.codehaus.jackson.annotate.JsonSubTypes;
+
-import org.codehaus.jackson.annotate.JsonTypeInfo;
+
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import java.util.List;
 

common/src/main/java/com/metamx/druid/jackson/CommaListJoinDeserializer.java

@@ -19,10 +19,15 @@
 
 package com.metamx.druid.jackson;
 
-import org.codehaus.jackson.JsonParser;
+
-import org.codehaus.jackson.JsonProcessingException;
+
-import org.codehaus.jackson.map.DeserializationContext;
+
-import org.codehaus.jackson.map.deser.std.StdScalarDeserializer;
+
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
 
 import java.io.IOException;
 import java.util.Arrays;