pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1221711 - in /pig/trunk: CHANGES.txt build.xml
Date Wed, 21 Dec 2011 13:18:19 GMT
Author: gdfm
Date: Wed Dec 21 13:18:19 2011
New Revision: 1221711

URL: http://svn.apache.org/viewvc?rev=1221711&view=rev
Log:
PIG-2438: Do not hardcode commons-lang version in build.xml (azaroth)


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=1221711&r1=1221710&r2=1221711&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Dec 21 13:18:19 2011
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
 
 IMPROVEMENTS
 
+PIG-2438: Do not hardcode commons-lang version in build.xml (azaroth)
+
 PIG-2422: Add log messages for Jython schema definitions (vivekp via gates)
 
 PIG-2403: Reduce code duplication in SUM, MAX, MIN udfs (dvryaboy)

Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1221711&r1=1221710&r2=1221711&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Wed Dec 21 13:18:19 2011
@@ -91,7 +91,6 @@
     <property name="pigunit.jarfile" value="pigunit.jar" />
     <property name="smoke.tests.jarfile" value="${build.dir}/${final.name}-smoketests.jar"
/>
     <property name="test.pigunit.src.dir" value="${test.src.dir}/org/apache/pig/test/pigunit"
/>
-    <property name="commons-lang.jarfile" value="commons-lang-2.4.jar" />    
     <property name="test.pigunit.file" value="${test.src.dir}/pigunit-tests"/>
 
 
@@ -811,15 +810,15 @@
     <!-- Pigunit                                                            -->
     <!-- ================================================================== -->
 
-    <target depends="compile-test" name="pigunit-jar" description="create the pigunit
jar file">
+    <target name="pigunit-jar" depends="compile-test, ivy-test" description="create the
pigunit jar file">
         <echo> *** Creating pigunit.jar ***</echo>
-      <jar destfile="${pigunit.jarfile}">
-          <fileset dir="${test.build.classes}">
-              <include name="**/org/apache/pig/pigunit/**"/>
-              <include name="**/org/apache/pig/test/Util.**"/>
-          </fileset>
-      	  <zipfileset src="${ivy.lib.dir}/${commons-lang.jarfile}" />
-      </jar>
+        <jar destfile="${pigunit.jarfile}">
+            <fileset dir="${test.build.classes}">
+                <include name="**/org/apache/pig/pigunit/**"/>
+                <include name="**/org/apache/pig/test/Util.**"/>
+            </fileset>
+      	    <zipfileset src="${ivy.lib.dir}/commons-lang-${commons-lang.version}.jar" />
+        </jar>
     </target>
 
     <target name="test-pigunit" depends="compile-test,jar-withouthadoop, pigunit-jar"
description="Run tests that test PigUnit">



Mime
View raw message