Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-9955 Make hadoop2 the default and deprecate hadoop1; REVERT 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1548351 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-12-06 01:16:51 +00:00
parent 7fbe97470e
commit fe5b28625a
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev-support/test-patch.sh
View File

@ -343,36 +343,36 @@ applyPatch () {
} }
############################################################################### ###############################################################################
### Attempt to compile against the hadoop 1.1 ### Attempt to compile against the hadoop 2.0
checkHadoop20Compile () { checkHadoop20Compile () {
echo "" echo ""
echo "" echo ""
echo "======================================================================" echo "======================================================================"
echo "======================================================================" echo "======================================================================"
echo " Checking against hadoop 1.1 build" echo " Checking against hadoop 2.0 build"
echo "======================================================================" echo "======================================================================"
echo "======================================================================" echo "======================================================================"
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 if [[ $patchForHadoop2 != 0 ]] ; then
return 0; return 0;
fi fi
export MAVEN_OPTS="${MAVEN_OPTS}" export MAVEN_OPTS="${MAVEN_OPTS}"
# build core and tests # 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 if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT 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 submitJiraComment 1
cleanupAndExit 1 cleanupAndExit 1
fi fi
JIRA_COMMENT="$JIRA_COMMENT 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 return 0
} }

6
hbase-common/pom.xml
View File

@ -230,7 +230,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>hadoop.profile</name><value>1.1</value> <!--h1--><name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
@ -241,7 +241,7 @@
</dependencies> </dependencies>
</profile> </profile>
<!-- profile against Hadoop 1.0.x: <!-- profile against Hadoop 1.0.x:
mvn -Dhadoop.profile=1.0 mvn -Dhadoop.profile=1.0
--> -->
<profile> <profile>
@ -273,7 +273,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>!hadoop.profile</name> <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>

4
hbase-examples/pom.xml
View File

@ -132,7 +132,7 @@ if we can combine these profiles somehow -->
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>hadoop.profile</name><value>1.1</value> <!--h1--><name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
@ -155,7 +155,7 @@ if we can combine these profiles somehow -->
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>!hadoop.profile</name> <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>

4
hbase-it/pom.xml
View File

@ -219,7 +219,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>hadoop.profile</name><value>1.1</value> <!--h1--><name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
@ -262,7 +262,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>!hadoop.profile</name> <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>

4
hbase-prefix-tree/pom.xml
View File

@ -104,7 +104,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>hadoop.profile</name><value>1.1</value> <!--h1--><name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
@ -138,7 +138,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>!hadoop.profile</name> <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>

4
hbase-server/pom.xml
View File

@ -522,7 +522,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>hadoop.profile</name><value>1.1</value> <!--h1--><name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
@ -564,7 +564,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>!hadoop.profile</name> <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>

4
hbase-shell/pom.xml
View File

@ -282,7 +282,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>hadoop.profile</name><value>1.1</value> <!--h1--><name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
@ -324,7 +324,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>!hadoop.profile</name> <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>

6
hbase-testing-util/pom.xml
View File

@ -121,7 +121,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>hadoop.profile</name><value>1.1</value> <!--h1--><name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
@ -167,7 +167,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>!hadoop.profile</name> <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
@ -253,4 +253,4 @@
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
</project> </project>

4
hbase-thrift/pom.xml
View File

@ -223,7 +223,7 @@ the same time. -->
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>hadoop.profile</name><value>1.1</value> <!--h1--><name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
@ -266,7 +266,7 @@ the same time. -->
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>!hadoop.profile</name> <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>

4
pom.xml
View File

@ -1487,7 +1487,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>hadoop.profile</name><value>1.1</value> <!--h1--><name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<modules> <modules>
@ -1606,7 +1606,7 @@
<activation> <activation>
<property> <property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh--> <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>!hadoop.profile</name> <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property> </property>
</activation> </activation>
<modules> <modules>