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 to...@apache.org on 2012/04/06 07:07:37 UTC
svn commit: r1310174 - in /hadoop/common/branches/HDFS-3042: ./
dev-support/test-patch.sh hadoop-project/pom.xml
Author: todd
Date: Fri Apr 6 05:07:33 2012
New Revision: 1310174
URL: http://svn.apache.org/viewvc?rev=1310174&view=rev
Log:
Merge trunk into auto-failover branch.
Addressed two semantic conflicts after the commit of HADOOP-8077 -- test code was referencing the old constant for the fencing methods config key.
Modified:
hadoop/common/branches/HDFS-3042/ (props changed)
hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh
hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
Propchange: hadoop/common/branches/HDFS-3042/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1309568-1310173
Modified: hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh?rev=1310174&r1=1310173&r2=1310174&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh Fri Apr 6 05:07:33 2012
@@ -311,7 +311,7 @@ checkTests () {
echo "======================================================================"
echo ""
echo ""
- testReferences=`$GREP -c -i '/test' $PATCH_DIR/patch`
+ testReferences=`$GREP -c -i -e '^+++.*/test' $PATCH_DIR/patch`
echo "There appear to be $testReferences test files referenced in the patch."
if [[ $testReferences == 0 ]] ; then
if [[ $JENKINS == "true" ]] ; then
@@ -333,7 +333,7 @@ checkTests () {
fi
JIRA_COMMENT="$JIRA_COMMENT
- +1 tests included. The patch appears to include $testReferences new or modified tests."
+ +1 tests included. The patch appears to include $testReferences new or modified test files."
return 0
}
Modified: hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml?rev=1310174&r1=1310173&r2=1310174&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml Fri Apr 6 05:07:33 2012
@@ -508,11 +508,6 @@
<version>1.6</version>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
@@ -684,6 +679,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
+ <configuration>
+ <excludes>
+ <exclude>mrapp-generated-classpath</exclude>
+ </excludes>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -789,6 +789,21 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-classpath</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <outputFile>target/classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>