Author: suresh
Date: Thu Apr 4 23:09:54 2013
New Revision: 1464784
URL: http://svn.apache.org/r1464784
Log:
HADOOP-9071. Merge 1464782 from branch-1
Modified:
hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
hadoop/common/branches/branch-1-win/build.xml
hadoop/common/branches/branch-1-win/src/contrib/build-contrib.xml
Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1464784&r1=1464783&r2=1464784&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Thu Apr 4
23:09:54 2013
@@ -349,3 +349,7 @@ Branch-hadoop-1-win (branched from branc
HADOOP-8973. DiskChecker cannot reliably detect an inaccessible disk on
Windows with NTFS ACLs. (Chris Nauroth via suresh)
+ MAPREDUCE-782. Use PureJavaCrc32 in mapreduce spills. (Todd Lipcon,
backport by Brandon Li via sseth)
+
+ HADOOP-9071. Configure ivy log levels for resolve/retrieve.
+ (Giridharan Kesavan via suresh)
Modified: hadoop/common/branches/branch-1-win/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/build.xml?rev=1464784&r1=1464783&r2=1464784&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/build.xml (original)
+++ hadoop/common/branches/branch-1-win/build.xml Thu Apr 4 23:09:54 2013
@@ -243,6 +243,8 @@
<!-- IVY properteis set here -->
<property name="ivy.dir" location="ivy" />
+ <!-- loglevel take values like default|download-only|quiet -->
+ <property name="loglevel" value="quiet"/>
<loadproperties srcfile="${ivy.dir}/libraries.properties"/>
<property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
<property name="asfrepo" value="https://repository.apache.org"/>
@@ -2706,78 +2708,78 @@
</target>
<target name="ivy-resolve" depends="ivy-init">
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"/>
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"
log="${loglevel}" />
</target>
<target name="ivy-resolve-javadoc" depends="ivy-init">
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"
conf="javadoc"/>
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="javadoc"
log="${loglevel}"/>
</target>
<target name="ivy-resolve-releaseaudit" depends="ivy-init">
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"
conf="releaseaudit"/>
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"
conf="releaseaudit" log="${loglevel}"/>
</target>
<target name="ivy-resolve-test" depends="ivy-init">
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="test" />
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="test"
log="${loglevel}"/>
</target>
<target name="ivy-resolve-common" depends="ivy-init">
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="common"
/>
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="common"
log="${loglevel}"/>
</target>
<target name="ivy-resolve-jdiff" depends="ivy-init">
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="jdiff" />
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="jdiff"
log="${loglevel}"/>
</target>
<target name="ivy-resolve-checkstyle" depends="ivy-init">
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"
conf="checkstyle"/>
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings"
conf="checkstyle" log="${loglevel}"/>
</target>
<target name="ivy-retrieve" depends="ivy-resolve"
description="Retrieve Ivy-managed artifacts">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
- pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"/>
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
log="${loglevel}"/>
</target>
<target name="ivy-retrieve-checkstyle" depends="ivy-resolve-checkstyle"
description="Retrieve Ivy-managed artifacts for the checkstyle
configurations">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
- pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"/>
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
log="${loglevel}"/>
<ivy:cachepath pathid="checkstyle-classpath" conf="checkstyle"/>
</target>
<target name="ivy-retrieve-jdiff" depends="ivy-resolve-jdiff"
description="Retrieve Ivy-managed artifacts for the javadoc
configurations">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
- pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"/>
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
log="${loglevel}"/>
<ivy:cachepath pathid="jdiff-classpath" conf="jdiff"/>
</target>
<target name="ivy-retrieve-javadoc" depends="ivy-resolve-javadoc"
description="Retrieve Ivy-managed artifacts for the javadoc
configurations">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
- pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"/>
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
log="${loglevel}"/>
<ivy:cachepath pathid="javadoc-classpath" conf="javadoc"/>
</target>
<target name="ivy-retrieve-test" depends="ivy-resolve-test"
description="Retrieve Ivy-managed artifacts for the test configurations">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
- pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"/>
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
log="${loglevel}"/>
<ivy:cachepath pathid="ivy-test.classpath" conf="test"/>
</target>
<target name="ivy-retrieve-common" depends="ivy-resolve-common"
description="Retrieve Ivy-managed artifacts for the compile
configurations">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
- pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"/>
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
log="${loglevel}"/>
<ivy:cachepath pathid="ivy-common.classpath" conf="common"/>
</target>
<target name="ivy-retrieve-releaseaudit" depends="ivy-resolve-releaseaudit"
description="Retrieve Ivy-managed artifacts for the compile
configurations">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
- pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" />
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
log="${loglevel}"/>
<ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
<available classname="${rat.reporting.classname}"
classpathref="releaseaudit-classpath" property="rat.present"
value="true"/>
@@ -3050,8 +3052,7 @@
<target name="jsvc" >
<mkdir dir="${jsvc.build.dir}" />
- <get src="${jsvc.location}" dest="${jsvc.build.dir}/${jsvc.dest.name}" />
-
+ <get src="${jsvc.location}" dest="${jsvc.build.dir}/${jsvc.dest.name}"/>
<untar compression="gzip" src="${jsvc.build.dir}/${jsvc.dest.name}"
dest="${jsvc.build.dir}" />
<copy file="${jsvc.build.dir}/jsvc"
toFile="${jsvc.install.dir}/jsvc.${os.arch}" verbose="true" />
Modified: hadoop/common/branches/branch-1-win/src/contrib/build-contrib.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/contrib/build-contrib.xml?rev=1464784&r1=1464783&r2=1464784&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/contrib/build-contrib.xml (original)
+++ hadoop/common/branches/branch-1-win/src/contrib/build-contrib.xml Thu Apr
4 23:09:54 2013
@@ -77,6 +77,8 @@
<!-- IVY properties set here -->
<property name="ivy.dir" location="ivy" />
+ <!-- loglevel take values like default|download-only|quiet -->
+ <property name="loglevel" value="quiet"/>
<property name="ivysettings.xml"
location="${hadoop.root}/ivy/ivysettings.xml"/>
<loadproperties srcfile="${ivy.dir}/libraries.properties"/>
<loadproperties srcfile="${hadoop.root}/ivy/libraries.properties"/>
@@ -487,13 +489,13 @@
</target>
<target name="ivy-resolve-common" depends="ivy-init">
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="common"
/>
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="common"
log="${loglevel}"/>
</target>
<target name="ivy-retrieve-common" depends="ivy-resolve-common"
description="Retrieve Ivy-managed artifacts for the compile/test
configurations">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
- pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
sync="true" />
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
sync="true" log="${loglevel}"/>
<ivy:cachepath pathid="${ant.project.name}.common-classpath" conf="common"
/>
</target>
</project>
