Author: suresh
Date: Thu Sep 29 00:33:34 2011
New Revision: 1177127
URL: http://svn.apache.org/viewvc?rev=1177127&view=rev
Log:
Reverting the previous trunk merge since it added other unintended changes in
addition
Modified:
hadoop/common/branches/HDFS-1623/ (props changed)
hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh
hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 29 00:33:34 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1177115
+/hadoop/common/trunk:1152502-1173011
Modified: hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh?rev=1177127&r1=1177126&r2=1177127&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh Thu Sep 29
00:33:34 2011
@@ -598,8 +598,8 @@ runTests () {
echo ""
echo ""
- echo "$MVN clean install test -Pnative -D${PROJECT_NAME}PatchProcess"
- $MVN clean install test -Pnative -D${PROJECT_NAME}PatchProcess
+ echo "$MVN clean test -Pnative -D${PROJECT_NAME}PatchProcess"
+ $MVN clean test -Pnative -D${PROJECT_NAME}PatchProcess
if [[ $? != 0 ]] ; then
### Find and format names of failed tests
failed_tests=`find . -name 'TEST*.xml' | xargs $GREP -l -E
"<failure|<error" | sed -e "s|.*target/surefire-reports/TEST-|
|g" | sed -e "s|\.xml||g"`
Modified: hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1177127&r1=1177126&r2=1177127&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Thu Sep 29 00:33:34
2011
@@ -76,9 +76,6 @@
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
<commons-daemon.version>1.0.3</commons-daemon.version>
-
- <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
- <test.build.data>${test.build.dir}</test.build.data>
</properties>
<dependencyManagement>
@@ -564,25 +561,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create-testdirs</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <mkdir dir="${test.build.dir}"/>
- <mkdir dir="${test.build.data}"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
