svn commit: r1510861 - in /hive/trunk: ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java shims/ivy.xml

[gu...@apache.org]

Author: gunther
Date: Tue Aug  6 05:55:51 2013
New Revision: 1510861

URL: http://svn.apache.org/r1510861
Log:
HIVE-4991: hive build with 0.20 is broken (Edward Capriolo via Gunther Hagleitner)

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java
    hive/trunk/shims/ivy.xml

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java?rev=1510861&r1=1510860&r2=1510861&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java Tue Aug  6 05:55:51 2013
@@ -24,7 +24,6 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
 import org.apache.hadoop.hive.shims.ShimLoader;
-import org.apache.hadoop.security.UserGroupInformation;
 
 /**
  * SecureCmdDoAs - Helper class for setting parameters and env necessary for
@@ -48,7 +47,7 @@ public class SecureCmdDoAs {
   }
 
   public void addEnv(Map<String, String> env){
-    env.put(UserGroupInformation.HADOOP_TOKEN_FILE_LOCATION,
+    env.put(ShimLoader.getHadoopShims().getTokenFileLocEnvName(),
         tokenPath.toUri().getPath());
   }
 

Modified: hive/trunk/shims/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/ivy.xml?rev=1510861&r1=1510860&r2=1510861&view=diff
==============================================================================
--- hive/trunk/shims/ivy.xml (original)
+++ hive/trunk/shims/ivy.xml Tue Aug  6 05:55:51 2013
@@ -121,6 +121,12 @@
     </dependency>
 
     <!-- Hadoop 0.20 shim dependencies. Used for building 0.20 shims. -->
+    <dependency org="commons-io" name="commons-io" rev="${commons-io.version}">
+      <include type="jar"/>
+      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
+      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
+    </dependency>
+
     <dependency org="org.apache.hadoop" name="hadoop-core"
                 rev="${hadoop-0.20.version}"
                 conf="hadoop0.20.shim->default">