You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2012/01/04 02:37:08 UTC
svn commit: r1227017 - in /pig/trunk: CHANGES.txt build.xml
Author: daijy
Date: Wed Jan 4 01:37:08 2012
New Revision: 1227017
URL: http://svn.apache.org/viewvc?rev=1227017&view=rev
Log:
Temporarily revert PIG-2349 due to 23 test issue
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=1227017&r1=1227016&r2=1227017&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Jan 4 01:37:08 2012
@@ -28,8 +28,6 @@ PIG-2453: Fetching schema can be very sl
PIG-2443: [Piggybank] Add UDFs to check if a String is an Integer And if a String is Numeric (prkommireddi via daijy)
-PIG-2349: Ant build repeats ivy-buildJar several times (azaroth)
-
PIG-2437: Use Ivy to get automaton.jar (azaroth)
PIG-2448: Convert more tests to use LOCAL mode (dvryaboy)
Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1227017&r1=1227016&r2=1227017&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Wed Jan 4 01:37:08 2012
@@ -1471,53 +1471,59 @@
<ivy:configure settingsid="${ant.project.name}.ivy.settings" file="${ivysettings.xml}" override='false'/>
</target>
- <target name="ivy-resolve" depends="ivy-init" unless="ivy.resolved" description="Resolve Ivy dependencies">
- <property name="ivy.resolved" value="true"/>
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"/>
- </target>
-
- <target name="ivy-compile" depends="ivy-resolve" description="Retrieve Ivy-managed artifacts for compile configuration">
+ <target name="ivy-compile" depends="ivy-init" description="Resolve, Retrieve Ivy-managed artifacts for compile configuration">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="compile"/>
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="compile"/>
<ivy:cachepath pathid="compile.classpath" conf="compile"/>
</target>
- <target name="ivy-test" depends="ivy-resolve" description="Retrieve Ivy-managed artifacts for test configuration">
+ <target name="ivy-test" depends="ivy-init" description="Resolve, Retrieve Ivy-managed artifacts for test configuration">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="test"/>
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="test"/>
<ivy:cachepath pathid="test-classpath" conf="test" type="jar,test-jar"/>
</target>
- <target name="ivy-javadoc" depends="ivy-resolve" description="Retrieve Ivy-managed artifacts for javadoc configuration">
+ <target name="ivy-javadoc" depends="ivy-init" description="Resolve, Retrieve Ivy-managed artifacts for javadoc configuration">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="javadoc"/>
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="javadoc"/>
<ivy:cachepath pathid="javadoc.classpath" conf="javadoc"/>
</target>
- <target name="ivy-releaseaudit" depends="ivy-resolve" description="Retrieve Ivy-managed artifacts for releaseaudit configuration">
+ <target name="ivy-releaseaudit" depends="ivy-init" description="Resolve, Retrieve Ivy-managed artifacts for releaseaudit configuration">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="releaseaudit"/>
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="releaseaudit"/>
<ivy:cachepath pathid="releaseaudit.classpath" conf="releaseaudit"/>
</target>
- <target name="ivy-checkstyle" depends="ivy-resolve" description="Retrieve Ivy-managed artifacts for checkstyle configuration">
+ <target name="ivy-checkstyle" depends="ivy-init" description="Resolve, Retrieve Ivy-managed artifacts for checkstyle configuration">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="checkstyle"/>
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="checkstyle"/>
<ivy:cachepath pathid="checkstyle.classpath" conf="checkstyle"/>
</target>
- <target name="ivy-buildJar" depends="ivy-resolve" description="Retrieve Ivy-managed artifacts for buildJar configuration">
+ <target name="ivy-buildJar" depends="ivy-init" description="Resolve, Retrieve Ivy-managed artifacts for buildJar configuration">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="buildJar"/>
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="buildJar"/>
<ivy:cachepath pathid="buildJar.classpath" conf="buildJar"/>
</target>
- <target name="ivy-jdiff" depends="ivy-resolve" description="Retrieve Ivy-managed artifacts for jdiff configuration">
+ <target name="ivy-jdiff" depends="ivy-init" description="Resolve, Retrieve Ivy-managed artifacts for jdiff configuration">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="jdiff"/>
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" conf="jdiff"/>
<ivy:cachepath pathid="jdiff.classpath" conf="jdiff"/>
</target>
+ <target name="ivy-resolve" depends="ivy-init">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="runtime"/>
+ </target>
+
<target name="assert-pig-jar-exists" depends="ivy-init">
<fail>
<condition >