From 1566999a6ac53b05d637d48a02b8904607f0c208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xavier@metamarkets.com>
Date: Tue, 2 Dec 2014 17:51:55 -0800
Subject: [PATCH] update jackson to 2.4.4

---
 .../JacksonifiedConnectionFactory.java        | 19 ++++++++++++++
 pom.xml                                       | 26 ++++++-------------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/extensions/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java b/extensions/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java
index 28f1d0d14d1..2e9f18cfd92 100644
--- a/extensions/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java
+++ b/extensions/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java
@@ -20,11 +20,16 @@
 package io.druid.firehose.rabbitmq;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Maps;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.LongString;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 
 /**
@@ -154,6 +159,20 @@ public class JacksonifiedConnectionFactory extends ConnectionFactory
     return uri;
   }
 
+  // we are only overriding this to help Jackson not be confused about the two setURI methods
+  @JsonIgnore
+  @Override
+  public void setUri(URI uri) throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException
+  {
+    super.setUri(uri);
+  }
+
+  @Override
+  public void setUri(String uriString) throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException
+  {
+    super.setUri(uriString);
+  }
+
   @Override
   @JsonProperty
   public int getRequestedChannelMax()
diff --git a/pom.xml b/pom.xml
index 7562dee7406..660e18cda0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,52 +223,42 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-core</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-guava</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-joda</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>
                 <artifactId>jackson-dataformat-smile</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.jaxrs</groupId>
                 <artifactId>jackson-jaxrs-json-provider</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.jaxrs</groupId>
                 <artifactId>jackson-jaxrs-smile-provider</artifactId>
-                <version>2.2.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-core-asl</artifactId>
-                <version>1.9.13</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-                <version>1.9.13</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>