Author: daijy
Date: Sun Apr 5 03:27:34 2015
New Revision: 1671370
URL: http://svn.apache.org/r1671370
Log:
PIG-4499: mvn-build miss tez classes in pig-h2.jar
Modified:
pig/trunk/CHANGES.txt
pig/trunk/build.xml
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1671370&r1=1671369&r2=1671370&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sun Apr 5 03:27:34 2015
@@ -58,6 +58,8 @@ PIG-4333: Split BigData tests into multi
BUG FIXES
+PIG-4499: mvn-build miss tez classes in pig-h2.jar (daijy)
+
PIG-4488: Pig on tez mask tez.queue.name (daijy)
PIG-4497: [Pig on Tez] NPE for null scalar (rohini)
Modified: pig/trunk/build.xml
URL:
http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1671370&r1=1671369&r2=1671370&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Sun Apr 5 03:27:34 2015
@@ -788,23 +788,6 @@
</sequential>
</macrodef>
- <target name="mvn-jar" description="Create pig.jar for maven deploy for
Hadoop2/23 and Hadoop1/20">
- <propertyreset name="hadoopversion" value="23" />
- <propertyreset name="isHadoop" value="true" />
- <propertyreset name="src.shims.dir"
value="${basedir}/shims/src/hadoop${hadoopversion}" />
- <antcall target="clean" inheritRefs="true" inheritall="true"/>
- <antcall target="jar" inheritRefs="true" inheritall="true"/>
- <!-- Move and rename pig jar for Hadoop2/23 to a different location
before compiling for Hadoop1/20 -->
- <move file="${output.jarfile.core}"
tofile="${basedir}/${artifact.pig-h2.jar}"/>
- <delete dir="${build.dir}" />
- <propertyreset name="hadoopversion" value="20" />
- <propertyreset name="isHadoop" value="" />
- <propertyreset name="src.shims.dir"
value="${basedir}/shims/src/hadoop${hadoopversion}" />
- <antcall target="jar" inheritRefs="true" inheritall="true"/>
- <move file="${output.jarfile.core}"
tofile="${output.jarfile.core-h1}"/>
- <move file="${basedir}/${artifact.pig-h2.jar}"
tofile="${output.jarfile.core-h2}"/>
- </target>
-
<!-- ================================================================== -->
<!-- macrodef: buildJar -->
<!-- ================================================================== -->
@@ -1250,7 +1233,7 @@
uri="urn:maven-artifact-ant"
classpathref="mvn-ant-task.classpath"/>
</target>
- <target name="mvn-install" depends="mvn-taskdef,mvn-jar, set-version,
source-jar,
+ <target name="mvn-install" depends="mvn-taskdef,jar-h12, set-version,
source-jar,
javadoc-jar, pigunit-jar, smoketests-jar, piggybank"
description="To install pig to local filesystem's m2 cache">
<artifact:pom file="${pig.pom}" id="pig"/>
@@ -1274,9 +1257,11 @@
</artifact:install>
</target>
- <target name="mvn-build" depends="mvn-jar, source-jar,
+ <target name="mvn-build" depends="jar-h12, source-jar,
javadoc-jar, smoketests-jar,
pigunit-jar, piggybank"
description="To build the pig jar artifacts to be deployed to apache
maven repository">
+ <move file="${output.jarfile.withouthadoop-h1}"
tofile="${output.jarfile.core-h1}"/>
+ <move file="${output.jarfile.withouthadoop-h2}"
tofile="${output.jarfile.core-h2}"/>
</target>
<!-- Expects that mvn-build has already been run but does not run it. In
some cases building
