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 2013/06/02 19:06:08 UTC

svn commit: r1488744 - /hive/trunk/ql/build.xml

Author: hashutosh
Date: Sun Jun  2 17:06:08 2013
New Revision: 1488744

URL: http://svn.apache.org/r1488744
Log:
HIVE-4562 : HIVE3393 brought in Jackson library,and these four jars should be packed into hive-exec.jar (caofangkun via Ashutosh Chauhan)

Modified:
    hive/trunk/ql/build.xml

Modified: hive/trunk/ql/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/build.xml?rev=1488744&r1=1488743&r2=1488744&view=diff
==============================================================================
--- hive/trunk/ql/build.xml (original)
+++ hive/trunk/ql/build.xml Sun Jun  2 17:06:08 2013
@@ -239,14 +239,12 @@
         <exclude name="META-INF/MANIFEST.MF"/>
       </patternset>
     </unzip>
-
     <unzip src="${build.ivy.lib.dir}/default/javolution-${javolution.version}.jar" dest="${build.dir.hive}/javolution/classes">
       <patternset>
         <exclude name="META-INF"/>
         <exclude name="META-INF/MANIFEST.MF"/>
       </patternset>
     </unzip>
-
     <unzip 
       src="${build.ivy.lib.dir}/default/protobuf-java-${protobuf.version}.jar" 
       dest="${build.dir.hive}/protobuf-java/classes">
@@ -255,7 +253,6 @@
         <exclude name="META-INF/MANIFEST.MF"/>
       </patternset>
     </unzip>
-
     <unzip 
       src="${build.ivy.lib.dir}/default/snappy-${snappy.version}.jar" 
       dest="${build.dir.hive}/snappy/classes">
@@ -264,6 +261,22 @@
         <exclude name="META-INF/MANIFEST.MF"/>
       </patternset>
     </unzip>
+    <unzip 
+      src="${build.ivy.lib.dir}/default/jackson-core-asl-${jackson.version}.jar" 
+      dest="${build.dir.hive}/jackson-core-asl/classes">
+      <patternset>
+        <exclude name="META-INF"/>
+        <exclude name="META-INF/MANIFEST.MF"/>
+      </patternset>
+    </unzip>
+    <unzip 
+      src="${build.ivy.lib.dir}/default/jackson-mapper-asl-${jackson.version}.jar" 
+      dest="${build.dir.hive}/jackson-mapper-asl/classes">
+      <patternset>
+        <exclude name="META-INF"/>
+        <exclude name="META-INF/MANIFEST.MF"/>
+      </patternset>
+    </unzip>
 
     <!-- jar jarfile="${build.dir}/hive_${name}.jar" basedir="${build.classes}" / -->
     <jar jarfile="${build.dir}/hive-exec-${version}.jar">
@@ -282,6 +295,10 @@
                includes="**/*.class"/>
       <fileset dir="${build.dir.hive}/snappy/classes" 
                includes="**/*.class"/>
+      <fileset dir="${build.dir.hive}/jackson-core-asl/classes"
+      	       includes="**/*.class"/>
+      <fileset dir="${build.dir.hive}/jackson-mapper-asl/classes"
+                 includes="**/*.class"/>
       <manifest>
         <!-- Not putting these in their own manifest section, since that inserts
              a new-line, which breaks the reading of the attributes. -->