You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2012/02/25 15:28:03 UTC
svn commit: r1293617 - in /hive/trunk: build-common.xml
eclipse-templates/.classpath ivy/libraries.properties lib/javaewah-0.3.jar
lib/javaewah.LICENSE ql/build.xml ql/ivy.xml
Author: hashutosh
Date: Sat Feb 25 14:28:03 2012
New Revision: 1293617
URL: http://svn.apache.org/viewvc?rev=1293617&view=rev
Log:
HIVE-2761: Remove lib/javaewah-0.3.jar (ecapriolo via hashutosh)
Removed:
hive/trunk/lib/javaewah-0.3.jar
hive/trunk/lib/javaewah.LICENSE
Modified:
hive/trunk/build-common.xml
hive/trunk/eclipse-templates/.classpath
hive/trunk/ivy/libraries.properties
hive/trunk/ql/build.xml
hive/trunk/ql/ivy.xml
Modified: hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build-common.xml?rev=1293617&r1=1293616&r2=1293617&view=diff
==============================================================================
--- hive/trunk/build-common.xml (original)
+++ hive/trunk/build-common.xml Sat Feb 25 14:28:03 2012
@@ -367,7 +367,7 @@
errorProperty="tests.failed" failureProperty="tests.failed" filtertrace="off">
<env key="HADOOP_HOME" value="${hadoop.root}"/>
- <env key="HADOOP_CLASSPATH" value="${test.src.data.dir}/conf:${build.dir.hive}/dist/lib/derby-${derby.version}.jar:${build.dir.hive}/dist/lib/javaewah-${javaewah.version}.jar:${hadoop.root}/modules/*"/> <!-- Modules needed for Hadoop 0.23 -->
+ <env key="HADOOP_CLASSPATH" value="${test.src.data.dir}/conf:${build.dir.hive}/dist/lib/derby-${derby.version}.jar:${build.dir.hive}/dist/lib/JavaEWAH-${javaewah.version}.jar:${hadoop.root}/modules/*"/> <!-- Modules needed for Hadoop 0.23 -->
<env key="TZ" value="US/Pacific"/>
<sysproperty key="test.output.overwrite" value="${overwrite}"/>
<sysproperty key="test.service.standalone.server" value="${standalone}"/>
Modified: hive/trunk/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/.classpath?rev=1293617&r1=1293616&r2=1293617&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/.classpath (original)
+++ hive/trunk/eclipse-templates/.classpath Sat Feb 25 14:28:03 2012
@@ -36,7 +36,7 @@
<classpathentry kind="lib" path="build/ivy/lib/default/commons-pool-@commons-pool.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/slf4j-api-@slf4j-api.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/slf4j-log4j12-@slf4j-log4j12.version@.jar"/>
- <classpathentry kind="lib" path="lib/javaewah-@javaewah.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/JavaEWAH-@javaewah.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/mockito-all-@mockito-all.version@.jar"/>
<classpathentry kind="lib" path="build/builtins/hive-builtins-@HIVE_VERSION@.jar"/>
<classpathentry kind="src" path="build/contrib/test/src"/>
Modified: hive/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/trunk/ivy/libraries.properties?rev=1293617&r1=1293616&r2=1293617&view=diff
==============================================================================
--- hive/trunk/ivy/libraries.properties (original)
+++ hive/trunk/ivy/libraries.properties Sat Feb 25 14:28:03 2012
@@ -40,7 +40,7 @@ derby.version=10.4.2.0
guava.version=r06
hbase.version=0.89.0-SNAPSHOT
hbase-test.version=0.89.0-SNAPSHOT
-javaewah.version=0.3
+javaewah.version=0.3.2
jdo-api.version=2.3-ec
jdom.version=1.1
jline.version=0.9.94
Modified: hive/trunk/ql/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/build.xml?rev=1293617&r1=1293616&r2=1293617&view=diff
==============================================================================
--- hive/trunk/ql/build.xml (original)
+++ hive/trunk/ql/build.xml Sat Feb 25 14:28:03 2012
@@ -220,7 +220,7 @@
<exclude name="META-INF/MANIFEST.MF"/>
</patternset>
</unzip>
- <unzip src="${hive.root}/lib/javaewah-${javaewah.version}.jar" dest="${build.dir.hive}/javaewah/classes">
+ <unzip src="${build.ivy.lib.dir}/default/JavaEWAH-${javaewah.version}.jar" dest="${build.dir.hive}/javaewah/classes">
<patternset>
<exclude name="meta-inf"/>
<exclude name="meta-inf/manifest.mf"/>
Modified: hive/trunk/ql/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/ivy.xml?rev=1293617&r1=1293616&r2=1293617&view=diff
==============================================================================
--- hive/trunk/ql/ivy.xml (original)
+++ hive/trunk/ql/ivy.xml Sat Feb 25 14:28:03 2012
@@ -62,5 +62,6 @@
<dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
transitive="false"/>
<dependency org="org.apache.derby" name="derby" rev="${derby.version}"/>
+ <dependency org="com.googlecode.javaewah" name="JavaEWAH" rev="${javaewah.version}"/>
</dependencies>
</ivy-module>