Review Board 1.7.22


HIVE-3393 brought in Jackson library,and these four jars should be packed into hive-exec.jar

Review Request #11173 - Created May 15, 2013 and updated

fangkun cao
hive-trunk
HIVE-4562
Reviewers
hive
hive
https://issues.apache.org/jira/browse/HIVE-4562

 

Diff revision 2 (Latest)

1 2
1 2

  1. http://svn.apache.org/repos/asf/hive/trunk/ql/build.xml: Loading...
http://svn.apache.org/repos/asf/hive/trunk/ql/build.xml
Revision 1482225 New Change
[20] 236 lines
[+20]
237
      <patternset>
237
      <patternset>
238
        <exclude name="META-INF"/>
238
        <exclude name="META-INF"/>
239
        <exclude name="META-INF/MANIFEST.MF"/>
239
        <exclude name="META-INF/MANIFEST.MF"/>
240
      </patternset>
240
      </patternset>
241
    </unzip>
241
    </unzip>
242

    
   

   
243
    <unzip src="${build.ivy.lib.dir}/default/javolution-${javolution.version}.jar" dest="${build.dir.hive}/javolution/classes">
242
    <unzip src="${build.ivy.lib.dir}/default/javolution-${javolution.version}.jar" dest="${build.dir.hive}/javolution/classes">
244
      <patternset>
243
      <patternset>
245
        <exclude name="META-INF"/>
244
        <exclude name="META-INF"/>
246
        <exclude name="META-INF/MANIFEST.MF"/>
245
        <exclude name="META-INF/MANIFEST.MF"/>
247
      </patternset>
246
      </patternset>
248
    </unzip>
247
    </unzip>
249

    
   

   
250
    <unzip 
248
    <unzip 
251
      src="${build.ivy.lib.dir}/default/protobuf-java-${protobuf.version}.jar" 
249
      src="${build.ivy.lib.dir}/default/protobuf-java-${protobuf.version}.jar" 
252
      dest="${build.dir.hive}/protobuf-java/classes">
250
      dest="${build.dir.hive}/protobuf-java/classes">
253
      <patternset>
251
      <patternset>
254
        <exclude name="META-INF"/>
252
        <exclude name="META-INF"/>
255
        <exclude name="META-INF/MANIFEST.MF"/>
253
        <exclude name="META-INF/MANIFEST.MF"/>
256
      </patternset>
254
      </patternset>
257
    </unzip>
255
    </unzip>
258

    
   

   
259
    <unzip 
256
    <unzip 
260
      src="${build.ivy.lib.dir}/default/snappy-${snappy.version}.jar" 
257
      src="${build.ivy.lib.dir}/default/snappy-${snappy.version}.jar" 
261
      dest="${build.dir.hive}/snappy/classes">
258
      dest="${build.dir.hive}/snappy/classes">
262
      <patternset>
259
      <patternset>
263
        <exclude name="META-INF"/>
260
        <exclude name="META-INF"/>
264
        <exclude name="META-INF/MANIFEST.MF"/>
261
        <exclude name="META-INF/MANIFEST.MF"/>
265
      </patternset>
262
      </patternset>
266
    </unzip>
263
    </unzip>

    
   
264
    <unzip 

    
   
265
      src="${build.ivy.lib.dir}/default/jackson-core-asl-${jackson.version}.jar" 

    
   
266
      dest="${build.dir.hive}/jackson-core-asl/classes">

    
   
267
      <patternset>

    
   
268
        <exclude name="META-INF"/>

    
   
269
        <exclude name="META-INF/MANIFEST.MF"/>

    
   
270
      </patternset>

    
   
271
    </unzip>

    
   
272
    <unzip 

    
   
273
      src="${build.ivy.lib.dir}/default/jackson-mapper-asl-${jackson.version}.jar" 

    
   
274
      dest="${build.dir.hive}/jackson-mapper-asl/classes">

    
   
275
      <patternset>

    
   
276
        <exclude name="META-INF"/>

    
   
277
        <exclude name="META-INF/MANIFEST.MF"/>

    
   
278
      </patternset>

    
   
279
    </unzip>
267

    
   
280

   
268
    <!-- jar jarfile="${build.dir}/hive_${name}.jar" basedir="${build.classes}" / -->
281
    <!-- jar jarfile="${build.dir}/hive_${name}.jar" basedir="${build.classes}" / -->
269
    <jar jarfile="${build.dir}/hive-exec-${version}.jar">
282
    <jar jarfile="${build.dir}/hive-exec-${version}.jar">
270
      <fileset dir="${build.dir.hive}/common/classes" includes="**/*.class"/>
283
      <fileset dir="${build.dir.hive}/common/classes" includes="**/*.class"/>
271
      <fileset dir="${build.dir.hive}/ql/classes" includes="**/*.class,**/*.properties"/>
284
      <fileset dir="${build.dir.hive}/ql/classes" includes="**/*.class,**/*.properties"/>
[+20] [20] 8 lines
[+20]
280
      <fileset dir="${build.dir.hive}/javolution/classes" includes="**/*.class"/>
293
      <fileset dir="${build.dir.hive}/javolution/classes" includes="**/*.class"/>
281
      <fileset dir="${build.dir.hive}/protobuf-java/classes" 
294
      <fileset dir="${build.dir.hive}/protobuf-java/classes" 
282
               includes="**/*.class"/>
295
               includes="**/*.class"/>
283
      <fileset dir="${build.dir.hive}/snappy/classes" 
296
      <fileset dir="${build.dir.hive}/snappy/classes" 
284
               includes="**/*.class"/>
297
               includes="**/*.class"/>

    
   
298
      <fileset dir="${build.dir.hive}/jackson-core-asl/classes"

    
   
299
      	       includes="**/*.class"/>

    
   
300
      <fileset dir="${build.dir.hive}/jackson-mapper-asl/classes"

    
   
301
                 includes="**/*.class"/>
285
      <manifest>
302
      <manifest>
286
        <!-- Not putting these in their own manifest section, since that inserts
303
        <!-- Not putting these in their own manifest section, since that inserts
287
             a new-line, which breaks the reading of the attributes. -->
304
             a new-line, which breaks the reading of the attributes. -->
288
        <attribute name="Implementation-Title" value="Hive"/>
305
        <attribute name="Implementation-Title" value="Hive"/>
289
        <attribute name="Implementation-Version" value="${version}"/>
306
        <attribute name="Implementation-Version" value="${version}"/>
[+20] [20] 19 lines
  1. http://svn.apache.org/repos/asf/hive/trunk/ql/build.xml: Loading...