From 5b50bb9ecdccfdc9abb189553f3fe8dc7650be57 Mon Sep 17 00:00:00 2001
From: Priyank <pshah@hortonworks.com>
Date: Wed, 9 Sep 2015 17:14:00 -0700
Subject: [PATCH] STORM-1039: Remove commons-codec shading, commons-codec is
 used by hadoop authentication library which is used during ui authentication
 in secured environment.

---
 storm-core/pom.xml                             | 14 +-------------
 storm-dist/binary/src/main/assembly/binary.xml |  1 -
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 3eb41127ec..529b4fffbf 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -379,7 +379,6 @@
                             <include>org.apache.commons:commons-compress</include>
                             <include>org.apache.commons:commons-exec</include>
                             <include>commons-io:commons-io</include>
-                            <include>commons-codec:commons-codec</include>
                             <include>commons-fileupload:commons-fileupload</include>
                             <include>commons-lang:commons-lang</include>
                             <include>com.googlecode.json-simple:json-simple</include>
@@ -494,10 +493,6 @@
                           <pattern>org.apache.commons.io</pattern>
                           <shadedPattern>org.apache.storm.commons.io</shadedPattern>
                         </relocation>
-                        <relocation>
-                          <pattern>org.apache.commons.codec</pattern>
-                          <shadedPattern>org.apache.storm.commons.codec</shadedPattern>
-                        </relocation>
                         <relocation>
                           <pattern>org.apache.commons.fileupload</pattern>
                           <shadedPattern>org.apache.storm.commons.fileupload</shadedPattern>
@@ -617,14 +612,7 @@
                                 <exclude>META-INF/NOTICE.txt</exclude>
                             </excludes>
                         </filter>
-                        <filter>
-                            <artifact>commons-codec:commons-codec</artifact>
-                            <excludes>
-                                <exclude>META-INF/LICENSE.txt</exclude>
-                                <exclude>META-INF/NOTICE.txt</exclude>
-                            </excludes>
-                        </filter>
-                        <filter>
+                       <filter>
                             <artifact>commons-fileupload:commons-fileupload</artifact>
                             <excludes>
                                 <exclude>META-INF/LICENSE.txt</exclude>
diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml
index 9f6c8f7c83..913a90bb59 100644
--- a/storm-dist/binary/src/main/assembly/binary.xml
+++ b/storm-dist/binary/src/main/assembly/binary.xml
@@ -50,7 +50,6 @@
                 <exclude>org.apache.commons:commons-compress</exclude>
                 <exclude>org.apache.commons:commons-exec</exclude>
                 <exclude>commons-io:commons-io</exclude>
-                <exclude>commons-codec:commons-codec</exclude>
                 <exclude>commons-fileupload:commons-fileupload</exclude>
                 <exclude>commons-lang:commons-lang</exclude>
                 <exclude>com.googlecode.json-simple:json-simple</exclude>