Merge branch 'master' of github.com:metamx/druid

client/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.5.28-SNAPSHOT</version>
+        <version>0.5.29-SNAPSHOT</version>
     </parent>
 
     <dependencies>

common/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.5.28-SNAPSHOT</version>
+        <version>0.5.29-SNAPSHOT</version>
     </parent>
 
     <dependencies>

examples/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.5.28-SNAPSHOT</version>
+        <version>0.5.29-SNAPSHOT</version>
     </parent>
 
     <dependencies>

indexing-common/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.5.28-SNAPSHOT</version>
+        <version>0.5.29-SNAPSHOT</version>
     </parent>
 
     <dependencies>

indexing-hadoop/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.5.28-SNAPSHOT</version>
+        <version>0.5.29-SNAPSHOT</version>
     </parent>
 
     <dependencies>

indexing-service/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.5.28-SNAPSHOT</version>
+        <version>0.5.29-SNAPSHOT</version>
     </parent>
 
     <dependencies>

indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ChatHandlerResource.java

 package com.metamx.druid.indexing.worker.executor;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Optional;
 import com.google.inject.Inject;
 import com.metamx.druid.indexing.common.index.ChatHandler;
-import com.metamx.druid.indexing.common.index.EventReceivingChatHandlerProvider;
+import com.metamx.druid.indexing.common.index.ChatHandlerProvider;
 
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -13,13 +12,11 @@ import javax.ws.rs.core.Response;
 @Path("/druid/worker/v1")
 public class ChatHandlerResource
 {
-  private final ObjectMapper jsonMapper;
-  private final EventReceivingChatHandlerProvider handlers;
+  private final ChatHandlerProvider handlers;
 
   @Inject
-  public ChatHandlerResource(ObjectMapper jsonMapper, EventReceivingChatHandlerProvider handlers)
+  public ChatHandlerResource(ChatHandlerProvider handlers)
   {
-    this.jsonMapper = jsonMapper;
     this.handlers = handlers;
   }
 

pom.xml

@@ -23,7 +23,7 @@
     <groupId>com.metamx</groupId>
     <artifactId>druid</artifactId>
     <packaging>pom</packaging>
-    <version>0.5.28-SNAPSHOT</version>
+    <version>0.5.29-SNAPSHOT</version>
     <name>druid</name>
     <description>druid</description>
     <scm>

realtime/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.5.28-SNAPSHOT</version>
+        <version>0.5.29-SNAPSHOT</version>
     </parent>
 
     <dependencies>

server/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.5.28-SNAPSHOT</version>
+        <version>0.5.29-SNAPSHOT</version>
     </parent>
 
     <dependencies>

services/pom.xml

@@ -24,11 +24,11 @@
     <artifactId>druid-services</artifactId>
     <name>druid-services</name>
     <description>druid-services</description>
-    <version>0.5.28-SNAPSHOT</version>
+    <version>0.5.29-SNAPSHOT</version>
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.5.28-SNAPSHOT</version>
+        <version>0.5.29-SNAPSHOT</version>
     </parent>
 
     <dependencies>