Index: dev-support/test-patch.sh
===================================================================
--- dev-support/test-patch.sh (revision 1548735)
+++ dev-support/test-patch.sh (working copy)
@@ -343,36 +343,36 @@
}
###############################################################################
-### Attempt to compile against the hadoop 2.0
+### Attempt to compile against the hadoop 1.1
checkHadoop20Compile () {
echo ""
echo ""
echo "======================================================================"
echo "======================================================================"
- echo " Checking against hadoop 2.0 build"
+ echo " Checking against hadoop 1.1 build"
echo "======================================================================"
echo "======================================================================"
echo ""
echo ""
- patchForHadoop2=`$GREP -c -i 'hadoop.profile=2.0' $PATCH_DIR/patch`
+ patchForHadoop2=`$GREP -c -i 'hadoop.profile=1.1' $PATCH_DIR/patch`
if [[ $patchForHadoop2 != 0 ]] ; then
return 0;
fi
export MAVEN_OPTS="${MAVEN_OPTS}"
# build core and tests
- $MVN clean test help:active-profiles -X -DskipTests -Dhadoop.profile=2.0 -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunk2.0JavacWarnings.txt 2>&1
+ $MVN clean test help:active-profiles -X -DskipTests -Dhadoop.profile=1.1 -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunk1.1JavacWarnings.txt 2>&1
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
- {color:red}-1 hadoop2.0{color}. The patch failed to compile against the hadoop 2.0 profile."
+ {color:red}-1 hadoop1.1{color}. The patch failed to compile against the hadoop 1.1 profile."
submitJiraComment 1
cleanupAndExit 1
fi
JIRA_COMMENT="$JIRA_COMMENT
- {color:green}+1 hadoop2.0{color}. The patch compiles against the hadoop 2.0 profile."
+ {color:green}+1 hadoop1.1{color}. The patch compiles against the hadoop 1.1 profile."
return 0
}
Index: hbase-client/pom.xml
===================================================================
--- hbase-client/pom.xml (revision 1548735)
+++ hbase-client/pom.xml (working copy)
@@ -158,7 +158,7 @@
- !hadoop.profile
+ hadoop.profile1.1
@@ -178,7 +178,7 @@
- hadoop.profile2.0
+ !hadoop.profile
Index: hbase-common/pom.xml
===================================================================
--- hbase-common/pom.xml (revision 1548735)
+++ hbase-common/pom.xml (working copy)
@@ -230,7 +230,7 @@
- !hadoop.profile
+ hadoop.profile1.1
@@ -241,7 +241,7 @@
-
@@ -273,7 +273,7 @@
- hadoop.profile2.0
+ !hadoop.profile
Index: hbase-examples/pom.xml
===================================================================
--- hbase-examples/pom.xml (revision 1548735)
+++ hbase-examples/pom.xml (working copy)
@@ -132,7 +132,7 @@
- !hadoop.profile
+ hadoop.profile1.1
@@ -155,7 +155,7 @@
- hadoop.profile2.0
+ !hadoop.profile
Index: hbase-it/pom.xml
===================================================================
--- hbase-it/pom.xml (revision 1548735)
+++ hbase-it/pom.xml (working copy)
@@ -219,7 +219,7 @@
- !hadoop.profile
+ hadoop.profile1.1
@@ -262,7 +262,7 @@
- hadoop.profile2.0
+ !hadoop.profile
Index: hbase-prefix-tree/pom.xml
===================================================================
--- hbase-prefix-tree/pom.xml (revision 1548735)
+++ hbase-prefix-tree/pom.xml (working copy)
@@ -104,7 +104,7 @@
- !hadoop.profile
+ hadoop.profile1.1
@@ -138,7 +138,7 @@
- hadoop.profile2.0
+ !hadoop.profile
Index: hbase-server/pom.xml
===================================================================
--- hbase-server/pom.xml (revision 1548735)
+++ hbase-server/pom.xml (working copy)
@@ -522,7 +522,7 @@
- !hadoop.profile
+ hadoop.profile1.1
@@ -564,7 +564,7 @@
- hadoop.profile2.0
+ !hadoop.profile
Index: hbase-shell/pom.xml
===================================================================
--- hbase-shell/pom.xml (revision 1548735)
+++ hbase-shell/pom.xml (working copy)
@@ -282,7 +282,7 @@
- !hadoop.profile
+ hadoop.profile1.1
@@ -324,7 +324,7 @@
- hadoop.profile2.0
+ !hadoop.profile
Index: hbase-testing-util/pom.xml
===================================================================
--- hbase-testing-util/pom.xml (revision 1548735)
+++ hbase-testing-util/pom.xml (working copy)
@@ -121,7 +121,7 @@
- !hadoop.profile
+ hadoop.profile1.1
@@ -167,7 +167,7 @@
- hadoop.profile2.0
+ !hadoop.profile
@@ -253,4 +253,4 @@
-
\ No newline at end of file
+
Index: hbase-thrift/pom.xml
===================================================================
--- hbase-thrift/pom.xml (revision 1548735)
+++ hbase-thrift/pom.xml (working copy)
@@ -223,7 +223,7 @@
- !hadoop.profile
+ hadoop.profile1.1
@@ -266,7 +266,7 @@
- hadoop.profile2.0
+ !hadoop.profile
Index: pom.xml
===================================================================
--- pom.xml (revision 1548735)
+++ pom.xml (working copy)
@@ -1481,13 +1481,13 @@
profiles with activation properties matching the profile here.
Generally, it should be sufficient to copy the first
few lines of the profile you want to match. -->
-
+
hadoop-1.1
- !hadoop.profile
+ hadoop.profile1.1
@@ -1600,13 +1600,14 @@
+ This is the default.
+ -->
hadoop-2.0
- hadoop.profile2.0
+ !hadoop.profile