You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/08/24 21:44:42 UTC
[1/3] storm git commit: STORM-829.
Repository: storm
Updated Branches:
refs/heads/master d4db41054 -> 460202eed
STORM-829.
STORM-829.
STORM-1000.
STORM-829.
STORM-829.
storm-829.
storm-829.
storm-829.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f73eed31
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f73eed31
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f73eed31
Branch: refs/heads/master
Commit: f73eed319a63fec6b07ecc5a9ec2d5477007cd1a
Parents: 89f4809
Author: YvonneIronberg <Yv...@gmail.com>
Authored: Tue Aug 18 10:37:31 2015 -0700
Committer: YvonneIronberg <Yv...@gmail.com>
Committed: Thu Aug 20 10:10:12 2015 -0700
----------------------------------------------------------------------
external/storm-hbase/pom.xml | 2 +-
external/storm-hdfs/pom.xml | 4 +--
storm-core/pom.xml | 63 ---------------------------------------
3 files changed, 3 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f73eed31/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index f93998d..0321b1a 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -37,7 +37,7 @@
<properties>
<hbase.version>0.98.4-hadoop2</hbase.version>
- <hdfs.version>2.2.0</hdfs.version>
+ <hdfs.version>${hadoop.version}</hdfs.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/storm/blob/f73eed31/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 7e927bf..b652a82 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>2.2.0</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>2.2.0</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/f73eed31/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 61abf70..205a22d 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -228,69 +228,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <version>2.4.0</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>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
[3/3] storm git commit: Add STORM-829 to CHANGELOG.md
Posted by kn...@apache.org.
Add STORM-829 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/460202ee
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/460202ee
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/460202ee
Branch: refs/heads/master
Commit: 460202eed6657b6cf110b2a1cbc7aa92e0764535
Parents: d0d213b
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Mon Aug 24 14:44:21 2015 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Mon Aug 24 14:44:21 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/460202ee/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1563869..2f41e7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-829: Hadoop dependency confusion
* STORM-166: Nimbus HA
* STORM-976: Config storm.logback.conf.dir is specific to previous logging framework
* STORM-995: Fix excessive logging
[2/3] storm git commit: Merge branch 'storm-829' of
https://github.com/YvonneIronberg/storm
Posted by kn...@apache.org.
Merge branch 'storm-829' of https://github.com/YvonneIronberg/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d0d213b3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d0d213b3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d0d213b3
Branch: refs/heads/master
Commit: d0d213b358bb33f59b59920fafafe22cc72b64c0
Parents: d4db410 f73eed3
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Mon Aug 24 14:20:09 2015 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Mon Aug 24 14:20:09 2015 -0500
----------------------------------------------------------------------
external/storm-hbase/pom.xml | 2 +-
external/storm-hdfs/pom.xml | 4 +--
storm-core/pom.xml | 63 ---------------------------------------
3 files changed, 3 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d0d213b3/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d0d213b3/storm-core/pom.xml
----------------------------------------------------------------------