You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2013/10/09 20:35:02 UTC

svn commit: r1530756 - in /hive/branches/branch-0.12: ivy/libraries.properties metastore/ivy.xml

Author: thejas
Date: Wed Oct  9 18:35:01 2013
New Revision: 1530756

URL: http://svn.apache.org/r1530756
Log:
HIVE-5493 : duplicate jars with different versions for guava, commons-logging (Thejas Nair via Ashutosh Chauhan)

Modified:
    hive/branches/branch-0.12/ivy/libraries.properties
    hive/branches/branch-0.12/metastore/ivy.xml

Modified: hive/branches/branch-0.12/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/ivy/libraries.properties?rev=1530756&r1=1530755&r2=1530756&view=diff
==============================================================================
--- hive/branches/branch-0.12/ivy/libraries.properties (original)
+++ hive/branches/branch-0.12/ivy/libraries.properties Wed Oct  9 18:35:01 2013
@@ -37,7 +37,7 @@ commons-configuration.version=1.6
 commons-httpclient.version=3.0.1
 commons-io.version=2.4
 commons-lang.version=2.4
-commons-logging.version=1.0.4
+commons-logging.version=1.1.1
 commons-logging-api.version=1.0.4
 commons-pool.version=1.5.4
 derby.version=10.4.2.0

Modified: hive/branches/branch-0.12/metastore/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/metastore/ivy.xml?rev=1530756&r1=1530755&r2=1530756&view=diff
==============================================================================
--- hive/branches/branch-0.12/metastore/ivy.xml (original)
+++ hive/branches/branch-0.12/metastore/ivy.xml Wed Oct  9 18:35:01 2013
@@ -31,7 +31,10 @@
     <dependency org="org.antlr" name="ST4" rev="${ST4.version}" transitive="false"/><!-- manually added (antlr dep), bad POM -->
     <dependency org="org.apache.hive" name="hive-serde" rev="${version}"
                 conf="compile->default" />
-    <dependency org="com.jolbox" name="bonecp" rev="${BoneCP.version}"/>
+    <dependency org="com.jolbox" name="bonecp" rev="${BoneCP.version}">
+        <exclude org="com.google.guava" module="guava"/>
+    </dependency>
+
     <dependency org="commons-pool" name="commons-pool" rev="${commons-pool.version}"/>
     <dependency org="org.datanucleus" name="datanucleus-api-jdo" rev="${datanucleus-api-jdo.version}">
         <exclude org="javax.jdo" module="jdo2-api"/>