HIVE-2761: Remove lib/javaewah-0.3.jar (ecapriolo via hashutosh)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1293617 13f79535-47bb-0310-9956-ffa450edef68
hbutani · Feb 25, 2012 · 60375c7 · 60375c7
1 parent 4a2c0a1
commit 60375c7
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 205 deletions.
diff --git a/build-common.xml b/build-common.xml
@@ -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}"/>

diff --git a/eclipse-templates/.classpath b/eclipse-templates/.classpath
@@ -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"/>

diff --git a/ivy/libraries.properties b/ivy/libraries.properties
@@ -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

diff --git a/lib/javaewah-0.3.jar b/lib/javaewah-0.3.jar
diff --git a/lib/javaewah.LICENSE b/lib/javaewah.LICENSE
diff --git a/ql/build.xml b/ql/build.xml
@@ -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"/>

diff --git a/ql/ivy.xml b/ql/ivy.xml
@@ -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>