You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/05/08 05:05:48 UTC
[4/6] storm git commit: [STORM-2482] Fixes to get the storm-autocreds
plugin working in master
[STORM-2482] Fixes to get the storm-autocreds plugin working in master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/56310f90
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/56310f90
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/56310f90
Branch: refs/heads/master
Commit: 56310f90cc49539c18b3701bc2256dbed816ab2c
Parents: 289d6ff
Author: Arun Mahadevan <ar...@apache.org>
Authored: Wed May 3 14:52:57 2017 +0530
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Wed May 3 18:09:50 2017 +0530
----------------------------------------------------------------------
external/storm-autocreds/pom.xml | 4 ++--
.../src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java | 4 ----
.../java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java | 3 +--
external/storm-hbase/pom.xml | 1 -
pom.xml | 1 +
storm-dist/binary/final-package/src/main/assembly/binary.xml | 2 +-
6 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/56310f90/external/storm-autocreds/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml
index 3762cfd..c6dcb7e 100644
--- a/external/storm-autocreds/pom.xml
+++ b/external/storm-autocreds/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
+ <artifactId>storm-client</artifactId>
<version>${project.version}</version>
<scope>${provided.scope}</scope>
<exclusions>
http://git-wip-us.apache.org/repos/asf/storm/blob/56310f90/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java
index e1e8512..5601ea4 100644
--- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java
+++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/AutoHDFS.java
@@ -21,7 +21,6 @@ package org.apache.storm.hdfs.security;
import org.apache.commons.math3.util.Pair;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
@@ -37,12 +36,9 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.net.URI;
-import java.nio.file.Paths;
import java.security.PrivilegedAction;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import static org.apache.storm.hdfs.security.HdfsSecurityUtil.STORM_KEYTAB_FILE_KEY;
http://git-wip-us.apache.org/repos/asf/storm/blob/56310f90/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java
index c0f3c79..94ea811 100644
--- a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java
+++ b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java
@@ -17,11 +17,10 @@
*/
package org.apache.storm.hdfs.security;
-import org.apache.storm.security.auth.kerberos.AutoTGT;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.storm.security.auth.kerberos.AutoTGT;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/storm/blob/56310f90/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index ea49ad0..4e763ab 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -36,7 +36,6 @@
</developers>
<properties>
- <hbase.version>1.1.0</hbase.version>
<hdfs.version>${hadoop.version}</hdfs.version>
<caffeine.version>2.3.5</caffeine.version>
</properties>
http://git-wip-us.apache.org/repos/asf/storm/blob/56310f90/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2ec2e6c..282a7fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,6 +276,7 @@
<clojure-contrib.version>1.2.0</clojure-contrib.version>
<hive.version>0.14.0</hive.version>
<hadoop.version>2.6.1</hadoop.version>
+ <hbase.version>1.1.0</hbase.version>
<kryo.version>3.0.3</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/56310f90/storm-dist/binary/final-package/src/main/assembly/binary.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/final-package/src/main/assembly/binary.xml b/storm-dist/binary/final-package/src/main/assembly/binary.xml
index 0d718e2..08b0035 100644
--- a/storm-dist/binary/final-package/src/main/assembly/binary.xml
+++ b/storm-dist/binary/final-package/src/main/assembly/binary.xml
@@ -304,7 +304,7 @@
</fileSet>
<!-- Autocred plugins -->
<fileSet>
- <directory>${project.basedir}/../../external/storm-autocreds/target/app-assembler/repo</directory>
+ <directory>${project.basedir}/../../../external/storm-autocreds/target/app-assembler/repo</directory>
<outputDirectory>external/storm-autocreds</outputDirectory>
<includes>
<include>*jar</include>