incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1200476 - in /incubator/hcatalog/trunk: CHANGES.txt build-common.xml build.xml
Date Thu, 10 Nov 2011 18:51:04 GMT
Author: gates
Date: Thu Nov 10 18:51:04 2011
New Revision: 1200476

URL: http://svn.apache.org/viewvc?rev=1200476&view=rev
Log:
HCATALOG-159 Build broken by recent Hive changes that move around jar files

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/build-common.xml
    incubator/hcatalog/trunk/build.xml

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1200476&r1=1200475&r2=1200476&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Thu Nov 10 18:51:04 2011
@@ -77,6 +77,8 @@ Trunk (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-159. Build broken by recent Hive changes that move around jar files (gates)
+
   HCAT-148. Meaningful error message on failure to resolve topic name for partition event
(thw via hashutosh)
 
   HCAT-136. Pig storer for export/import does maintain partition order (n_krishna_kumar via
khorgath)

Modified: incubator/hcatalog/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build-common.xml?rev=1200476&r1=1200475&r2=1200476&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build-common.xml (original)
+++ incubator/hcatalog/trunk/build-common.xml Thu Nov 10 18:51:04 2011
@@ -21,13 +21,16 @@
         <fileset dir="${hive.root}/build/serde" includes="*.jar"/>
         <fileset dir="${hive.root}/build/metastore" includes="*.jar"/>
         <fileset dir="${hive.root}/build/ql" includes="*.jar"/>
-        <fileset dir="${hive.root}/ql/lib" includes="antlr-3.0.1.jar"/>
         <fileset dir="${hive.root}/build/hadoopcore/hadoop-0.20.3-CDH3-SNAPSHOT/"
                  includes="hadoop-core-0.20.3-CDH3-SNAPSHOT.jar"/>
         <fileset dir="${common.ivy.lib.dir}" includes="*.jar"/>
-        <fileset dir="${hive.root}/build/ivy/lib/default" includes="jdo2-api-2.3-ec.jar"/>
-        <fileset dir="${hive.root}/build/ivy/lib/default" includes="datanucleus-enhancer-2.0.3.jar"/>
-        <fileset dir="${hive.root}/build/ivy/lib/default" includes="datanucleus-core-2.0.3.jar"/>
+        <fileset dir="${hive.root}/build/ivy/lib/default" includes="antlr-3.0.1.jar"/>
+        <fileset dir="${hive.root}/build/ivy/lib/default" includes="commons-lang-*.jar"/>
+        <fileset dir="${hive.root}/build/ivy/lib/default" includes="commons-logging-*.jar"/>
+        <fileset dir="${hive.root}/build/ivy/lib/default" includes="commons-logging-api-*.jar"/>
+        <fileset dir="${hive.root}/build/ivy/lib/default" includes="datanucleus-enhancer-*.jar"/>
+        <fileset dir="${hive.root}/build/ivy/lib/default" includes="datanucleus-core-*.jar"/>
+        <fileset dir="${hive.root}/build/ivy/lib/default" includes="jdo2-api-*.jar"/>
         <fileset dir="${hive.root}/build/ivy/lib/default" includes="libfb303-*.jar"/>
         <fileset dir="${common.lib.dir}" includes="hadoop_archive-0.3.1.jar"/>
         <fileset dir="${hive.root}/lib" includes="asm-3.1.jar"/>

Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1200476&r1=1200475&r2=1200476&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Thu Nov 10 18:51:04 2011
@@ -440,18 +440,26 @@
       <fileset dir="${lib.dir}"/>
 
       <fileset dir="hive/external/build/ivy/lib/default">
-        <include name="jdo2-api-*.jar"/>
-        <include name="log4j-*.jar"/>
-        <include name="slf4j-*.jar"/>
+        <include name="antlr-runtime-*.jar"/>
+        <include name="asm-*.jar"/>
+        <include name="commons-cli-*.jar"/>
+        <include name="commons-collections-*.jar"/>
+        <include name="commons-dbcp-*.jar"/>
+        <include name="commons-lang-*.jar"/>
+        <include name="commons-logging-*.jar"/>
+        <include name="commons-logging-api-*.jar"/>
+        <include name="commons-pool-*.jar"/>
         <include name="datanucleus-connectionpool-*.jar"/>
         <include name="datanucleus-core-*.jar"/>
-        <include name="datanucleus-rdbms-*.jar"/>
         <include name="datanucleus-enhancer-*.jar"/>
-        <include name="commons-cli-*.jar"/>
-        <include name="commons-pool-*.jar"/>
-        <include name="commons-dbcp-*.jar"/>
+        <include name="datanucleus-rdbms-*.jar"/>
+        <include name="derby-*.jar"/>
         <include name="guava-*.jar"/>
+        <include name="jdo2-api-*.jar"/>
+        <include name="jline-*.jar"/>
         <include name="libthrift-*.jar"/>
+        <include name="log4j-*.jar"/>
+        <include name="slf4j-*.jar"/>
       </fileset>
 
       <fileset dir="hive/external/build/shims">
@@ -482,22 +490,6 @@
         <include name="hive-metastore-*.jar"/>
       </fileset>
 
-      <fileset dir="hive/external/lib">
-        <include name="commons-collections-*.jar"/>
-        <include name="commons-logging-*.jar"/>
-        <include name="commons-logging-api-*.jar"/>
-        <include name="commons-lang-*.jar"/>
-        <include name="asm-api-*.jar"/>
-        <include name="derby-*.jar"/>
-      </fileset>
-
-      <fileset dir="hive/external/cli/lib">
-        <include name="jline-*.jar"/>
-      </fileset>
-
-      <fileset dir="hive/external/ql/lib">
-        <include name="antlr-runtime-*.jar"/>
-      </fileset>
     </copy>
 
     <copy todir="${dist.dir}/bin">



Mime
View raw message