From 9632b0cb8fe9beb60d0a837af951238b5ffb1219 Mon Sep 17 00:00:00 2001
From: Himanshu Gupta <g.himanshu@gmail.com>
Date: Tue, 20 Jun 2017 22:09:26 -0500
Subject: [PATCH 1/2] exclude aws-java-sdk from hdfs-storage module

---
 extensions-core/hdfs-storage/pom.xml | 20 +++++++++++++++-----
 pom.xml                              |  8 +++++++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml
index 8dd014629b99..cf026613520b 100644
--- a/extensions-core/hdfs-storage/pom.xml
+++ b/extensions-core/hdfs-storage/pom.xml
@@ -140,11 +140,21 @@
             <artifactId>emitter</artifactId>
             <scope>provided</scope>
         </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-aws</artifactId>
-        <version>${hadoop.compile.version}</version>
-      </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-aws</artifactId>
+          <version>${hadoop.compile.version}</version>
+          <exclusions>
+            <exclusion>
+              <groupId>com.amazonaws</groupId>
+              <artifactId>aws-java-sdk</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>aws-java-sdk-s3</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
diff --git a/pom.xml b/pom.xml
index 317a4910cecb..2040d027068e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
         <hadoop.compile.version>2.7.3</hadoop.compile.version>
         <hive.version>2.0.0</hive.version>
         <powermock.version>1.6.6</powermock.version>
+        <aws.sdk.version>1.10.77</aws.sdk.version>
     </properties>
 
     <modules>
@@ -189,7 +190,7 @@
                 <artifactId>aws-java-sdk-ec2</artifactId>
                 <!-- Cannot update to AWS SDK 1.11+ because of Jackson incompatibility.
                      Need to update Druid to use Jackson 2.6+ -->
-                <version>1.10.77</version>
+                <version>${aws.sdk.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -209,6 +210,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-s3</artifactId>
+                <version>${aws.sdk.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.ning</groupId>
                 <artifactId>compress-lzf</artifactId>

From cd4957cf4a862464535b6a7ab486e73ce039320c Mon Sep 17 00:00:00 2001
From: Himanshu Gupta <g.himanshu@gmail.com>
Date: Wed, 21 Jun 2017 14:47:56 -0500
Subject: [PATCH 2/2] address review comments

---
 pom.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2040d027068e..9972b128dbba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,8 @@
         <hadoop.compile.version>2.7.3</hadoop.compile.version>
         <hive.version>2.0.0</hive.version>
         <powermock.version>1.6.6</powermock.version>
+        <!-- Cannot update to AWS SDK 1.11+ because of Jackson incompatibility.
+        Need to update Druid to use Jackson 2.6+ -->
         <aws.sdk.version>1.10.77</aws.sdk.version>
     </properties>
 
@@ -188,8 +190,6 @@
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-java-sdk-ec2</artifactId>
-                <!-- Cannot update to AWS SDK 1.11+ because of Jackson incompatibility.
-                     Need to update Druid to use Jackson 2.6+ -->
                 <version>${aws.sdk.version}</version>
                 <exclusions>
                     <exclusion>
@@ -214,6 +214,24 @@
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-java-sdk-s3</artifactId>
                 <version>${aws.sdk.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-annotations</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-codec</groupId>
+                        <artifactId>commons-codec</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.ning</groupId>