From 2452f6ef8acb76d89e015a12dcbb1c9b399a3743 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Fri, 27 Jun 2014 19:48:49 -0700
Subject: [PATCH] Fix dependency conflicts.

---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aa5902685..635da734e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
     <properties>
         <dropwizard.version>0.7.0</dropwizard.version>
         <jackson.api.version>2.3.3</jackson.api.version>
+        <commons-codec.version>1.6</commons-codec.version>
     </properties>
 
     <dependencies>
@@ -116,7 +117,7 @@
         <dependency>
             <groupId>com.twilio.sdk</groupId>
             <artifactId>twilio-java-sdk</artifactId>
-            <version>3.4.1</version>
+            <version>3.4.5</version>
         </dependency>
 
         <dependency>
@@ -135,6 +136,11 @@
                 <artifactId>jackson-databind</artifactId>
                 <version>${jackson.api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons-codec.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>