hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1468443 - in /hive/branches/branch-0.11: ivy/libraries.properties shims/ivy.xml
Date Tue, 16 Apr 2013 14:45:06 GMT
Author: hashutosh
Date: Tue Apr 16 14:45:06 2013
New Revision: 1468443

URL: http://svn.apache.org/r1468443
Log:
HIVE-4352 : Guava not getting included in build package (Gunther Hagleitner via Ashutosh Chauhan)

Modified:
    hive/branches/branch-0.11/ivy/libraries.properties
    hive/branches/branch-0.11/shims/ivy.xml

Modified: hive/branches/branch-0.11/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ivy/libraries.properties?rev=1468443&r1=1468442&r2=1468443&view=diff
==============================================================================
--- hive/branches/branch-0.11/ivy/libraries.properties (original)
+++ hive/branches/branch-0.11/ivy/libraries.properties Tue Apr 16 14:45:06 2013
@@ -43,8 +43,7 @@ commons-logging.version=1.0.4
 commons-logging-api.version=1.0.4
 commons-pool.version=1.5.4
 derby.version=10.4.2.0
-guava-hadoop20.version=r09
-guava-hadoop23.version=11.0.2
+guava.version=11.0.2
 hbase.version=0.92.0
 jackson.version=1.8.8
 javaewah.version=0.3.2

Modified: hive/branches/branch-0.11/shims/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/shims/ivy.xml?rev=1468443&r1=1468442&r2=1468443&view=diff
==============================================================================
--- hive/branches/branch-0.11/shims/ivy.xml (original)
+++ hive/branches/branch-0.11/shims/ivy.xml Tue Apr 16 14:45:06 2013
@@ -41,10 +41,9 @@
     <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${jackson.version}"/>
     <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${jackson.version}"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" />
+    <dependency org="com.google.guava" name="guava" rev="${guava.version}" transitive="false"/>
 
     <!-- Hadoop 0.23 dependencies. Used both for shims and for building against Hadoop
0.23. -->
-    <dependency org="com.google.guava" name="guava" rev="${guava-hadoop23.version}"
-                conf="hadoop0.23.shim->default" transitive="false"/>
     <dependency org="org.apache.hadoop" name="hadoop-common"
                 rev="${hadoop-0.23.version}"
                 conf="hadoop0.23.shim->default">
@@ -122,8 +121,6 @@
     </dependency>
 
     <!-- Hadoop 0.20 shim dependencies. Used for building 0.20 shims. -->
-    <dependency org="com.google.guava" name="guava" rev="${guava-hadoop20.version}"
-                conf="hadoop0.20.shim->default" transitive="false"/>
     <dependency org="org.apache.hadoop" name="hadoop-core"
                 rev="${hadoop-0.20.version}"
                 conf="hadoop0.20.shim->default">
@@ -147,8 +144,6 @@
     </dependency>
 
     <!-- Hadoop 0.20S (or 1.0.0) shim dependencies. Used for building 0.20S shims. -->
-    <dependency org="com.google.guava" name="guava" rev="${guava-hadoop20.version}"
-                conf="hadoop0.20S.shim->default" transitive="false"/>
     <dependency org="org.apache.hadoop" name="hadoop-core"
                 rev="${hadoop-0.20S.version}"
                 conf="hadoop0.20S.shim->default">



Mime
View raw message