You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by gk...@apache.org on 2009/07/27 12:09:38 UTC
svn commit: r798093 - in /hadoop/common/trunk: CHANGES.txt build.xml ivy.xml
ivy/libraries.properties
Author: gkesavan
Date: Mon Jul 27 10:09:38 2009
New Revision: 798093
URL: http://svn.apache.org/viewvc?rev=798093&view=rev
Log:
HADOOP-6160. Fix ant releaseaudit target to run on specific directories. (Contributed by Giridharan Kesavan)
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/build.xml
hadoop/common/trunk/ivy.xml
hadoop/common/trunk/ivy/libraries.properties
Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=798093&r1=798092&r2=798093&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Mon Jul 27 10:09:38 2009
@@ -485,6 +485,9 @@
HADOOP-6161. Add get/setEnum methods to Configuration. (cdouglas)
+ HADOOP-6160. Fix releaseaudit target to run on specific directories.
+ (gkesavan)
+
OPTIMIZATIONS
HADOOP-5595. NameNode does not need to run a replicator to choose a
Modified: hadoop/common/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=798093&r1=798092&r2=798093&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Mon Jul 27 10:09:38 2009
@@ -1013,12 +1013,19 @@
<!-- ================================================================== -->
<!-- Perform audit activities for the release -->
<!-- ================================================================== -->
- <target name="releaseaudit" depends="package,ivy-retrieve-releaseaudit" description="Release Audit activities">
- <fail unless="rat.present" message="Failed to load class [${rat.reporting.classname}]."/>
- <java classname="${rat.reporting.classname}" fork="true">
- <classpath refid="releaseaudit-classpath"/>
- <arg value="${build.dir}/${final.name}"/>
- </java>
+ <target name="rats-taskdef" depends="ivy-retrieve-releaseaudit">
+ <typedef format="xml" resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:org.apache.rat.anttasks"
+ classpathref="releaseaudit-classpath"/>
+ </target>
+
+ <target name="releaseaudit" depends="package, rats-taskdef" description="Release Audit activities">
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
+ <fileset dir="${dist.dir}">
+ <exclude name="CHANGES.txt"/>
+ <exclude name="docs/"/>
+ <exclude name="lib/jdiff/"/>
+ </fileset>
+ </rat:report>
</target>
<!-- ================================================================== -->
@@ -1278,8 +1285,6 @@
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}" />
<ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
- <available classname="${rat.reporting.classname}"
- classpathref="releaseaudit-classpath" property="rat.present" value="true"/>
</target>
<target name="ivy-report" depends="ivy-resolve-releaseaudit"
Modified: hadoop/common/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/ivy.xml?rev=798093&r1=798092&r2=798093&view=diff
==============================================================================
--- hadoop/common/trunk/ivy.xml (original)
+++ hadoop/common/trunk/ivy.xml Mon Jul 27 10:09:38 2009
@@ -228,8 +228,8 @@
name="junit"
rev="${junit.version}"
conf="common->default"/>
- <dependency org="com.google.code.p.arat"
- name="rat-lib"
+ <dependency org="org.apache.rat"
+ name="apache-rat-tasks"
rev="${rats-lib.version}"
conf="releaseaudit->default"/>
<dependency org="commons-lang"
Modified: hadoop/common/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/ivy/libraries.properties?rev=798093&r1=798092&r2=798093&view=diff
==============================================================================
--- hadoop/common/trunk/ivy/libraries.properties (original)
+++ hadoop/common/trunk/ivy/libraries.properties Mon Jul 27 10:09:38 2009
@@ -61,7 +61,7 @@
oro.version=2.0.8
-rats-lib.version=0.5.1
+rats-lib.version=0.6
servlet.version=4.0.6
servlet-api-2.5.version=6.1.14