Author: cos
Date: Tue Nov 23 22:02:04 2010
New Revision: 1038357
URL: http://svn.apache.org/viewvc?rev=1038357&view=rev
Log:
MAPREDUCE-2199. build is broken 0.22 branch creation. Contributed by Konstantin
Boudnik.
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/ivy/libraries.properties
hadoop/mapreduce/trunk/src/test/aop/build/aop.xml
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1038357&r1=1038356&r2=1038357&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Tue Nov 23 22:02:04 2010
@@ -14,6 +14,8 @@ Trunk (unreleased changes)
BUG FIXES
+ MAPREDUCE-2199. build is broken 0.22 branch creation. (cos)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/mapreduce/trunk/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/libraries.properties?rev=1038357&r1=1038356&r2=1038357&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy/libraries.properties (original)
+++ hadoop/mapreduce/trunk/ivy/libraries.properties Tue Nov 23 22:02:04 2010
@@ -41,8 +41,8 @@ ftplet-api.version=1.0.0
ftpserver-core.version=1.0.0
ftpserver-deprecated.version=1.0.0-M2
-hadoop-common.version=0.22.0-SNAPSHOT
-hadoop-hdfs.version=0.22.0-SNAPSHOT
+hadoop-common.version=0.23.0-SNAPSHOT
+hadoop-hdfs.version=0.23.0-SNAPSHOT
hsqldb.version=1.8.0.10
Modified: hadoop/mapreduce/trunk/src/test/aop/build/aop.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/aop/build/aop.xml?rev=1038357&r1=1038356&r2=1038357&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/aop/build/aop.xml (original)
+++ hadoop/mapreduce/trunk/src/test/aop/build/aop.xml Tue Nov 23 22:02:04 2010
@@ -21,7 +21,7 @@
<property name="aspectversion" value="1.6.5"/>
<!-- TODO this has to be changed synchronously with build.xml version
prop.-->
<!-- this workarounds of test-patch setting its own 'version' -->
- <property name="project.version" value="0.22.0-SNAPSHOT"/>
+ <property name="project.version" value="0.23.0-SNAPSHOT"/>
<!-- Properties common for all fault injections -->
<property name="build-fi.dir" value="${basedir}/build-fi"/>
@@ -182,7 +182,8 @@
description="Make hadoop-mapred-instrumented-test.jar with system
injections.">
<subant buildpath="build.xml" target="-do-jar-test">
<property name="build.dir" value="${system-test-build-dir}"/>
- <property name="test.final.name"
value="${name}-${herriot.suffix}-test-${version}"/>
+ <property name="test.final.name"
+ value="${name}-${herriot.suffix}-test-${project.version}"/>
<property name="test.build.classes"
value="${system-test-build-dir}/test/classes"/>
</subant>
