Repository: storm
Updated Branches:
  refs/heads/master 45726bbd1 -> 396f6531a


Applies shading to hadoop-auth, cleaner exclusions


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/70197332
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/70197332
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/70197332

Branch: refs/heads/master
Commit: 70197332bba46ffd2b38da183e835bd370a68e70
Parents: 574928b
Author: Derek Dagit <[email protected]>
Authored: Wed Jan 13 11:26:10 2016 -0600
Committer: Derek Dagit <[email protected]>
Committed: Wed Jan 13 11:29:21 2016 -0600

----------------------------------------------------------------------
 storm-core/pom.xml | 45 +++------------------------------------------
 1 file changed, 3 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/70197332/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 6534a85..440eee0 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -342,46 +342,6 @@
             <version>${hadoop.version}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-all</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-codec</groupId>
-                    <artifactId>commons-codec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-minikdc</artifactId>
-                </exclusion>
-                <exclusion>
                     <groupId>org.apache.directory.server</groupId>
                     <artifactId>apacheds-kerberos-codec</artifactId>
                 </exclusion>
@@ -394,8 +354,8 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -540,6 +500,7 @@
                             <include>org.jgrapht:jgrapht-core</include>
                             <include>org.apache.commons:commons-exec</include>
                             
<include>org.apache.commons:commons-compress</include>
+                            <include>org.apache.hadoop:hadoop-auth</include>
                             <include>commons-io:commons-io</include>
                             <include>commons-codec:commons-codec</include>
                             
<include>commons-fileupload:commons-fileupload</include>

Reply via email to