diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index b31542b8894..7d5be447a30 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -343,36 +343,36 @@ applyPatch () { } ############################################################################### -### Attempt to compile against the hadoop 1.1 +### Attempt to compile against the hadoop 2.0 checkHadoop20Compile () { echo "" echo "" echo "======================================================================" echo "======================================================================" - echo " Checking against hadoop 1.1 build" + echo " Checking against hadoop 2.0 build" echo "======================================================================" echo "======================================================================" echo "" echo "" - patchForHadoop2=`$GREP -c -i 'hadoop.profile=1.1' $PATCH_DIR/patch` + patchForHadoop2=`$GREP -c -i 'hadoop.profile=2.0' $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=1.1 -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunk1.1JavacWarnings.txt 2>&1 + $MVN clean test help:active-profiles -X -DskipTests -Dhadoop.profile=2.0 -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunk2.0JavacWarnings.txt 2>&1 if [[ $? != 0 ]] ; then JIRA_COMMENT="$JIRA_COMMENT - {color:red}-1 hadoop1.1{color}. The patch failed to compile against the hadoop 1.1 profile." + {color:red}-1 hadoop2.0{color}. The patch failed to compile against the hadoop 2.0 profile." submitJiraComment 1 cleanupAndExit 1 fi JIRA_COMMENT="$JIRA_COMMENT - {color:green}+1 hadoop1.1{color}. The patch compiles against the hadoop 1.1 profile." + {color:green}+1 hadoop2.0{color}. The patch compiles against the hadoop 2.0 profile." return 0 } diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 6425fc90f52..f1841372f8e 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -230,7 +230,7 @@ - hadoop.profile1.1 + !hadoop.profile @@ -241,7 +241,7 @@ - @@ -273,7 +273,7 @@ - !hadoop.profile + hadoop.profile2.0 diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index a89a210372d..07c3a1708f3 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -132,7 +132,7 @@ if we can combine these profiles somehow --> - hadoop.profile1.1 + !hadoop.profile @@ -155,7 +155,7 @@ if we can combine these profiles somehow --> - !hadoop.profile + hadoop.profile2.0 diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 6bc99b3226a..7a475a9dd03 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -219,7 +219,7 @@ - hadoop.profile1.1 + !hadoop.profile @@ -262,7 +262,7 @@ - !hadoop.profile + hadoop.profile2.0 diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index 6af9eb2986d..bd69b56fd34 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -104,7 +104,7 @@ - hadoop.profile1.1 + !hadoop.profile @@ -138,7 +138,7 @@ - !hadoop.profile + hadoop.profile2.0 diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index f5723b25c5a..087c02aed52 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -522,7 +522,7 @@ - hadoop.profile1.1 + !hadoop.profile @@ -564,7 +564,7 @@ - !hadoop.profile + hadoop.profile2.0 diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index bc1a47d4aea..175f06fd9f5 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -282,7 +282,7 @@ - hadoop.profile1.1 + !hadoop.profile @@ -324,7 +324,7 @@ - !hadoop.profile + hadoop.profile2.0 diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index fec51159857..fa1dc7241fc 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -121,7 +121,7 @@ - hadoop.profile1.1 + !hadoop.profile @@ -167,7 +167,7 @@ - !hadoop.profile + hadoop.profile2.0 @@ -253,4 +253,4 @@ - + \ No newline at end of file diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 934f441e818..0cda3ac9651 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -223,7 +223,7 @@ the same time. --> - hadoop.profile1.1 + !hadoop.profile @@ -266,7 +266,7 @@ the same time. --> - !hadoop.profile + hadoop.profile2.0 diff --git a/pom.xml b/pom.xml index b556f499648..87164a84460 100644 --- a/pom.xml +++ b/pom.xml @@ -1487,7 +1487,7 @@ - hadoop.profile1.1 + !hadoop.profile @@ -1606,7 +1606,7 @@ - !hadoop.profile + hadoop.profile2.0