You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/12/06 02:16:52 UTC
svn commit: r1548351 - in /hbase/trunk: dev-support/test-patch.sh
hbase-common/pom.xml hbase-examples/pom.xml hbase-it/pom.xml
hbase-prefix-tree/pom.xml hbase-server/pom.xml hbase-shell/pom.xml
hbase-testing-util/pom.xml hbase-thrift/pom.xml pom.xml
Author: stack
Date: Fri Dec 6 01:16:51 2013
New Revision: 1548351
URL: http://svn.apache.org/r1548351
Log:
HBASE-9955 Make hadoop2 the default and deprecate hadoop1; REVERT
Modified:
hbase/trunk/dev-support/test-patch.sh
hbase/trunk/hbase-common/pom.xml
hbase/trunk/hbase-examples/pom.xml
hbase/trunk/hbase-it/pom.xml
hbase/trunk/hbase-prefix-tree/pom.xml
hbase/trunk/hbase-server/pom.xml
hbase/trunk/hbase-shell/pom.xml
hbase/trunk/hbase-testing-util/pom.xml
hbase/trunk/hbase-thrift/pom.xml
hbase/trunk/pom.xml
Modified: hbase/trunk/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/dev-support/test-patch.sh?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/dev-support/test-patch.sh (original)
+++ hbase/trunk/dev-support/test-patch.sh Fri Dec 6 01:16:51 2013
@@ -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
}
Modified: hbase/trunk/hbase-common/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/pom.xml?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/hbase-common/pom.xml (original)
+++ hbase/trunk/hbase-common/pom.xml Fri Dec 6 01:16:51 2013
@@ -230,7 +230,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ <!--h1--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -241,7 +241,7 @@
</dependencies>
</profile>
- <!-- profile against Hadoop 1.0.x:
+ <!-- profile against Hadoop 1.0.x:
mvn -Dhadoop.profile=1.0
-->
<profile>
@@ -273,7 +273,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
+ <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property>
</activation>
<dependencies>
Modified: hbase/trunk/hbase-examples/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-examples/pom.xml?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/hbase-examples/pom.xml (original)
+++ hbase/trunk/hbase-examples/pom.xml Fri Dec 6 01:16:51 2013
@@ -132,7 +132,7 @@ if we can combine these profiles somehow
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ <!--h1--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -155,7 +155,7 @@ if we can combine these profiles somehow
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
+ <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property>
</activation>
<dependencies>
Modified: hbase/trunk/hbase-it/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/pom.xml?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/hbase-it/pom.xml (original)
+++ hbase/trunk/hbase-it/pom.xml Fri Dec 6 01:16:51 2013
@@ -219,7 +219,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ <!--h1--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -262,7 +262,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
+ <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property>
</activation>
<dependencies>
Modified: hbase/trunk/hbase-prefix-tree/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-prefix-tree/pom.xml?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/hbase-prefix-tree/pom.xml (original)
+++ hbase/trunk/hbase-prefix-tree/pom.xml Fri Dec 6 01:16:51 2013
@@ -104,7 +104,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ <!--h1--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -138,7 +138,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
+ <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property>
</activation>
<dependencies>
Modified: hbase/trunk/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/pom.xml?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Fri Dec 6 01:16:51 2013
@@ -522,7 +522,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ <!--h1--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -564,7 +564,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
+ <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property>
</activation>
<dependencies>
Modified: hbase/trunk/hbase-shell/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-shell/pom.xml?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/hbase-shell/pom.xml (original)
+++ hbase/trunk/hbase-shell/pom.xml Fri Dec 6 01:16:51 2013
@@ -282,7 +282,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ <!--h1--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -324,7 +324,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
+ <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property>
</activation>
<dependencies>
Modified: hbase/trunk/hbase-testing-util/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-testing-util/pom.xml?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/hbase-testing-util/pom.xml (original)
+++ hbase/trunk/hbase-testing-util/pom.xml Fri Dec 6 01:16:51 2013
@@ -121,7 +121,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ <!--h1--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -167,7 +167,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
+ <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property>
</activation>
<dependencies>
@@ -253,4 +253,4 @@
</dependencies>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: hbase/trunk/hbase-thrift/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-thrift/pom.xml?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/hbase-thrift/pom.xml (original)
+++ hbase/trunk/hbase-thrift/pom.xml Fri Dec 6 01:16:51 2013
@@ -223,7 +223,7 @@ the same time. -->
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ <!--h1--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -266,7 +266,7 @@ the same time. -->
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
+ <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property>
</activation>
<dependencies>
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1548351&r1=1548350&r2=1548351&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Fri Dec 6 01:16:51 2013
@@ -1487,7 +1487,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h1--><name>hadoop.profile</name><value>1.1</value>
+ <!--h1--><name>!hadoop.profile</name>
</property>
</activation>
<modules>
@@ -1606,7 +1606,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
+ <!--h2--><name>hadoop.profile</name><value>2.0</value>
</property>
</activation>
<modules>