hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1548736 - in /hbase/branches/0.98: ./ dev-support/ hbase-client/ hbase-common/ hbase-examples/ hbase-it/ hbase-prefix-tree/ hbase-server/ hbase-shell/ hbase-testing-util/ hbase-thrift/
Date Fri, 06 Dec 2013 22:31:04 GMT
Author: stack
Date: Fri Dec  6 22:31:04 2013
New Revision: 1548736

URL: http://svn.apache.org/r1548736
Log:
HBASE-9955 Make hadoop2 the default and deprecate hadoop1

Modified:
    hbase/branches/0.98/dev-support/test-patch.sh
    hbase/branches/0.98/hbase-client/pom.xml
    hbase/branches/0.98/hbase-common/pom.xml
    hbase/branches/0.98/hbase-examples/pom.xml
    hbase/branches/0.98/hbase-it/pom.xml
    hbase/branches/0.98/hbase-prefix-tree/pom.xml
    hbase/branches/0.98/hbase-server/pom.xml
    hbase/branches/0.98/hbase-shell/pom.xml
    hbase/branches/0.98/hbase-testing-util/pom.xml
    hbase/branches/0.98/hbase-thrift/pom.xml
    hbase/branches/0.98/pom.xml

Modified: hbase/branches/0.98/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/dev-support/test-patch.sh?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/dev-support/test-patch.sh (original)
+++ hbase/branches/0.98/dev-support/test-patch.sh Fri Dec  6 22:31:04 2013
@@ -343,36 +343,36 @@ applyPatch () {
 }
 
 ###############################################################################
-### 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
 }
 

Modified: hbase/branches/0.98/hbase-client/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-client/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-client/pom.xml (original)
+++ hbase/branches/0.98/hbase-client/pom.xml Fri Dec  6 22:31:04 2013
@@ -158,7 +158,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h1--><name>!hadoop.profile</name>
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
         </property>
       </activation>
       <dependencies>
@@ -178,7 +178,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h2--><name>hadoop.profile</name><value>2.0</value>
+            <!--h2--><name>!hadoop.profile</name>
         </property>
       </activation>
       <dependencies>

Modified: hbase/branches/0.98/hbase-common/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-common/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-common/pom.xml (original)
+++ hbase/branches/0.98/hbase-common/pom.xml Fri Dec  6 22:31:04 2013
@@ -230,7 +230,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h1--><name>!hadoop.profile</name>
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
         </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><value>2.0</value>
+            <!--h2--><name>!hadoop.profile</name>
         </property>
       </activation>
       <dependencies>

Modified: hbase/branches/0.98/hbase-examples/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-examples/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-examples/pom.xml (original)
+++ hbase/branches/0.98/hbase-examples/pom.xml Fri Dec  6 22:31:04 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>
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
              </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><value>2.0</value>
+            <!--h2--><name>!hadoop.profile</name>
              </property>
          </activation>
          <dependencies>

Modified: hbase/branches/0.98/hbase-it/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-it/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-it/pom.xml (original)
+++ hbase/branches/0.98/hbase-it/pom.xml Fri Dec  6 22:31:04 2013
@@ -219,7 +219,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h1--><name>!hadoop.profile</name>
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
         </property>
       </activation>
       <dependencies>
@@ -262,7 +262,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h2--><name>hadoop.profile</name><value>2.0</value>
+            <!--h2--><name>!hadoop.profile</name>
         </property>
       </activation>
       <dependencies>

Modified: hbase/branches/0.98/hbase-prefix-tree/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-prefix-tree/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-prefix-tree/pom.xml (original)
+++ hbase/branches/0.98/hbase-prefix-tree/pom.xml Fri Dec  6 22:31:04 2013
@@ -104,7 +104,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h1--><name>!hadoop.profile</name>
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
         </property>
       </activation>
       <dependencies>
@@ -138,7 +138,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h2--><name>hadoop.profile</name><value>2.0</value>
+            <!--h2--><name>!hadoop.profile</name>
         </property>
       </activation>
       <dependencies>

Modified: hbase/branches/0.98/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/pom.xml (original)
+++ hbase/branches/0.98/hbase-server/pom.xml Fri Dec  6 22:31:04 2013
@@ -522,7 +522,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h1--><name>!hadoop.profile</name>
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
         </property>
       </activation>
       <dependencies>
@@ -564,7 +564,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h2--><name>hadoop.profile</name><value>2.0</value>
+            <!--h2--><name>!hadoop.profile</name>
         </property>
       </activation>
       <dependencies>

Modified: hbase/branches/0.98/hbase-shell/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-shell/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-shell/pom.xml (original)
+++ hbase/branches/0.98/hbase-shell/pom.xml Fri Dec  6 22:31:04 2013
@@ -282,7 +282,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h1--><name>!hadoop.profile</name>
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
         </property>
       </activation>
       <dependencies>
@@ -324,7 +324,7 @@
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h2--><name>hadoop.profile</name><value>2.0</value>
+            <!--h2--><name>!hadoop.profile</name>
         </property>
       </activation>
       <dependencies>

Modified: hbase/branches/0.98/hbase-testing-util/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-testing-util/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-testing-util/pom.xml (original)
+++ hbase/branches/0.98/hbase-testing-util/pom.xml Fri Dec  6 22:31:04 2013
@@ -121,7 +121,7 @@
             <activation>
                 <property>
                     <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-                    <!--h1--><name>!hadoop.profile</name>
+                    <!--h1--><name>hadoop.profile</name><value>1.1</value>
                 </property>
             </activation>
             <dependencies>
@@ -167,7 +167,7 @@
             <activation>
                 <property>
                     <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-                    <!--h2--><name>hadoop.profile</name><value>2.0</value>
+                    <!--h2--><name>!hadoop.profile</name>
                 </property>
             </activation>
             <dependencies>
@@ -253,4 +253,4 @@
             </dependencies>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>

Modified: hbase/branches/0.98/hbase-thrift/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-thrift/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-thrift/pom.xml (original)
+++ hbase/branches/0.98/hbase-thrift/pom.xml Fri Dec  6 22:31:04 2013
@@ -223,7 +223,7 @@ the same time. -->
       <activation>
         <property>
           <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-          <!--h1--><name>!hadoop.profile</name>
+          <!--h1--><name>hadoop.profile</name><value>1.1</value>
         </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><value>2.0</value>
+          <!--h2--><name>!hadoop.profile</name>
         </property>
       </activation>
       <dependencies>

Modified: hbase/branches/0.98/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/pom.xml?rev=1548736&r1=1548735&r2=1548736&view=diff
==============================================================================
--- hbase/branches/0.98/pom.xml (original)
+++ hbase/branches/0.98/pom.xml Fri Dec  6 22:31:04 2013
@@ -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.  -->
-    <!-- profile against Hadoop 1.1.x: This is the default. -->
+    <!-- profile against Hadoop 1.1.x. -->
     <profile>
       <id>hadoop-1.1</id>
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h1--><name>!hadoop.profile</name>
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
         </property>
       </activation>
       <modules>
@@ -1600,13 +1600,14 @@
     </profile>
 
     <!-- profile for building against Hadoop 2.0.x
-    Activate using: mvn -Dhadoop.profile=2.0 -->
+         This is the default.
+         -->
     <profile>
       <id>hadoop-2.0</id>
       <activation>
         <property>
             <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h2--><name>hadoop.profile</name><value>2.0</value>
+            <!--h2--><name>!hadoop.profile</name>
         </property>
       </activation>
       <modules>



Mime
View raw message