diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 8105565..0401d18 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -369,6 +369,34 @@ checkHadoop20Compile () { return 0 } +############################################################################### +### Attempt to compile against the hadoop 1.0 +checkHadoop10Compile () { + echo "" + echo "" + echo "======================================================================" + echo "======================================================================" + echo " Checking against hadoop 1.0 build" + echo "======================================================================" + echo "======================================================================" + echo "" + echo "" + + export MAVEN_OPTS="${MAVEN_OPTS}" + # build core and tests + $MVN clean test help:active-profiles -X -DskipTests -Dhadoop.profile=1.0 -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunk1.0JavacWarnings.txt 2>&1 + if [[ $? != 0 ]] ; then + JIRA_COMMENT="$JIRA_COMMENT + + {color:red}-1 hadoop1.0{color}. The patch failed to compile against the hadoop 1.0 profile." + cleanupAndExit 1 + fi + JIRA_COMMENT="$JIRA_COMMENT + + {color:green}+1 hadoop1.0{color}. The patch compiles against the hadoop 1.0 profile." + return 0 +} + ############################################################################### ### Check there are no javadoc warnings @@ -802,6 +830,8 @@ if [[ $? != 0 ]] ; then cleanupAndExit 1 fi +checkHadoop10Compile +(( RESULT = RESULT + $? )) checkHadoop20Compile (( RESULT = RESULT + $? )) checkJavadocWarnings diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 335e6e1..ad0192d 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -211,11 +211,11 @@ - - hadoop-1.0 + hadoop-1.1 !hadoop.profile @@ -229,6 +229,29 @@ + + + hadoop-1.0 + + + hadoop.profile + 1.0 + + + + + org.apache.hadoop + hadoop-core + + + commons-io + commons-io + + + + - - hadoop-1.0 + hadoop-1.1 !hadoop.profile diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 17c1577..2662669 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -186,11 +186,11 @@ - - hadoop-1.0 + hadoop-1.1 !hadoop.profile diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 2ea730c..8fbb77a 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -564,11 +564,11 @@ - - hadoop-1.0 + hadoop-1.1 !hadoop.profile @@ -585,6 +585,25 @@ + + hadoop-1.0 + + + hadoop.profile + 1.0 + + + + + org.apache.hadoop + hadoop-core + + + org.apache.hadoop + hadoop-test + + + - + - hadoop-1.0 + hadoop-1.1 !hadoop.profile @@ -1451,6 +1451,68 @@ + + + + hadoop-1.0 + + + hadoop.profile + 1.0 + + + + hbase-hadoop1-compat + + + 1.0.4 + + ${hadoop.version} + 1.4.3 + hbase-hadoop1-compat + src/main/assembly/hadoop-one-compat.xml + + + + + org.apache.hadoop + hadoop-core + ${hadoop.version} + true + + + hsqldb + hsqldb + + + net.sf.kosmosfs + kfs + + + org.eclipse.jdt + core + + + net.java.dev.jets3t + jets3t + + + oro + oro + + + + + org.apache.hadoop + hadoop-test + ${hadoop.version} + true + test + + + + +