You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/11 16:18:22 UTC

[1/3] storm git commit: STORM-1160: Add hadoop-auth dependency needed for storm-core

Repository: storm
Updated Branches:
  refs/heads/master e1527d9d1 -> 405b4beaf


STORM-1160: Add hadoop-auth dependency needed for storm-core

hadoop-auth is needed for storm ui in a secured cluster for
authentication. Adding the dependency back since it was removed in one
of the commits.


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

Branch: refs/heads/master
Commit: f939fc27fbcc8dd1fc1e3b9d8948f1994fc399af
Parents: e1527d9
Author: Priyank <ps...@hortonworks.com>
Authored: Fri Jan 8 17:15:51 2016 -0800
Committer: Priyank <ps...@hortonworks.com>
Committed: Fri Jan 8 17:15:51 2016 -0800

----------------------------------------------------------------------
 external/storm-hdfs/pom.xml |  2 +-
 pom.xml                     |  2 +-
 storm-core/pom.xml          | 67 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f939fc27/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 7fad1a3..820b29b 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-auth</artifactId>
-            <version>2.4.0</version>
+            <version>${hadoop.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/storm/blob/f939fc27/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e7abe94..16517a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,7 +227,7 @@
         <clojure-data-codec.version>0.1.0</clojure-data-codec.version>
         <clojure-contrib.version>1.2.0</clojure-contrib.version>
         <hive.version>0.14.0</hive.version>
-        <hadoop.version>2.6.0</hadoop.version>
+        <hadoop.version>2.7.1</hadoop.version>
         <kryo.version>2.21</kryo.version>
         <servlet.version>2.5</servlet.version>
         <joda-time.version>2.3</joda-time.version>

http://git-wip-us.apache.org/repos/asf/storm/blob/f939fc27/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 891ef72..765e798 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -332,6 +332,73 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+        <dependency>
+            <!--
+            hadoop-auth is needed in storm-core because ui in a secured storm cluster needs it for authentication.
+            Please DO NOT REMOVE this dependency
+            -->
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-auth</artifactId>
+            <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>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src/jvm</sourceDirectory>


[3/3] storm git commit: Added STORM-1160 to Changelog

Posted by bo...@apache.org.
Added STORM-1160 to Changelog


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

Branch: refs/heads/master
Commit: 405b4beaf094b782dec3f7bb324a90e39198cc84
Parents: e6e532e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 09:17:48 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 09:17:48 2016 -0600

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/405b4bea/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72d756b..2eddb48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-1160: Add hadoop-auth dependency needed for storm-core
  * STORM-1404: Fix Mockito test failures in storm-kafka.
  * STORM-1379: Removed Redundant Structure
  * STORM-706: Clarify examples README for IntelliJ.


[2/3] storm git commit: Merge branch 'STORM-1160' of https://github.com/priyank5485/storm into STORM-1160

Posted by bo...@apache.org.
Merge branch 'STORM-1160' of https://github.com/priyank5485/storm into STORM-1160

STORM-1160: Add hadoop-auth dependency needed for storm-core


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

Branch: refs/heads/master
Commit: e6e532e1d9bbcf61c7a17a75ea6e484c8e6f1ef7
Parents: e1527d9 f939fc2
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 09:02:47 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 09:02:47 2016 -0600

----------------------------------------------------------------------
 external/storm-hdfs/pom.xml |  2 +-
 pom.xml                     |  2 +-
 storm-core/pom.xml          | 67 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 2 deletions(-)
----------------------------------------------------------------------