hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject git commit: HBASE-12251 [book] Hadoop compat matrix 0.94 section needs cleaned up
Date Tue, 14 Oct 2014 05:44:45 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 904654aa8 -> 43e596bec


HBASE-12251 [book] Hadoop compat matrix 0.94 section needs cleaned up


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/43e596be
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/43e596be
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/43e596be

Branch: refs/heads/master
Commit: 43e596becb441ecf02c823f112c3eefa65f5df0b
Parents: 904654a
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Mon Oct 13 21:30:23 2014 -0700
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Mon Oct 13 21:31:09 2014 -0700

----------------------------------------------------------------------
 src/main/docbkx/configuration.xml | 97 ++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/43e596be/src/main/docbkx/configuration.xml
----------------------------------------------------------------------
diff --git a/src/main/docbkx/configuration.xml b/src/main/docbkx/configuration.xml
index aec8a00..d3959b6 100644
--- a/src/main/docbkx/configuration.xml
+++ b/src/main/docbkx/configuration.xml
@@ -485,52 +485,7 @@ hadoop  -       nproc   32000
             <row>
               <entry>Hadoop-2.2.0 </entry>
               <entry>X</entry>
-              <entry><para>NT - To get 0.94.x to run on hadoop 2.2.0, you need
to change the hadoop
-                  2 and protobuf versions in the <filename>pom.xml</filename>:
Here is a diff with
-                  pom.xml changes: </para>
-                  <programlisting><![CDATA[$ svn diff pom.xml
-Index: pom.xml
-===================================================================
---- pom.xml     (revision 1545157)
-+++ pom.xml     (working copy)
-@@ -1034,7 +1034,7 @@
-     <slf4j.version>1.4.3</slf4j.version>
-     <log4j.version>1.2.16</log4j.version>
-     <mockito-all.version>1.8.5</mockito-all.version>
--    <protobuf.version>2.4.0a</protobuf.version>
-+    <protobuf.version>2.5.0</protobuf.version>
-     <stax-api.version>1.0.1</stax-api.version>
-     <thrift.version>0.8.0</thrift.version>
-     <zookeeper.version>3.4.5</zookeeper.version>
-@@ -2241,7 +2241,7 @@
-         </property>
-       </activation>
-       <properties>
--        <hadoop.version>2.0.0-alpha</hadoop.version>
-+        <hadoop.version>2.2.0</hadoop.version>
-         <slf4j.version>1.6.1</slf4j.version>
-       </properties>
-       <dependencies>]]>
-                   </programlisting>
-                  <para>The next step is to regenerate Protobuf files and assuming
that the Protobuf
-                    has been installed:</para>
-                  <itemizedlist>
-                    <listitem>
-                      <para>Go to the hbase root folder, using the command line;</para>
-                    </listitem>
-                    <listitem>
-                      <para>Type the following commands:</para>
-                      <para>
-                        <programlisting language="bourne"><![CDATA[$ protoc -Isrc/main/protobuf
--java_out=src/main/java src/main/protobuf/hbase.proto]]></programlisting>
-                      </para>
-                      <para>
-                        <programlisting language="bourne"><![CDATA[$ protoc -Isrc/main/protobuf
--java_out=src/main/java src/main/protobuf/ErrorHandling.proto]]></programlisting>
-                      </para>
-                    </listitem>
-                  </itemizedlist>
-                  <para> Building against the hadoop 2 profile by running something
like the
-                    following command: </para>
-                  <screen language="bourne">$  mvn clean install assembly:single -Dhadoop.profile=2.0
-DskipTests</screen></entry>
+              <entry><link linkend="hadoop2.hbase-0.94">NT</link></entry>
               <entry>S</entry>
               <entry>S</entry>
               <entry>NT</entry>
@@ -577,6 +532,56 @@ Index: pom.xml
         </para>
       </note>
       <section
+        xml:id="hadoop2.hbase-0.94">
+        <title>Apache HBase 0.94 with Hadoop 2</title>
+        <para>To get 0.94.x to run on hadoop 2.2.0, you need to change the hadoop
+        2 and protobuf versions in the <filename>pom.xml</filename>: Here is
a diff with
+        pom.xml changes: </para>
+        <programlisting><![CDATA[$ svn diff pom.xml
+Index: pom.xml
+===================================================================
+--- pom.xml     (revision 1545157)
++++ pom.xml     (working copy)
+@@ -1034,7 +1034,7 @@
+     <slf4j.version>1.4.3</slf4j.version>
+     <log4j.version>1.2.16</log4j.version>
+     <mockito-all.version>1.8.5</mockito-all.version>
+-    <protobuf.version>2.4.0a</protobuf.version>
++    <protobuf.version>2.5.0</protobuf.version>
+     <stax-api.version>1.0.1</stax-api.version>
+     <thrift.version>0.8.0</thrift.version>
+     <zookeeper.version>3.4.5</zookeeper.version>
+@@ -2241,7 +2241,7 @@
+         </property>
+       </activation>
+       <properties>
+-        <hadoop.version>2.0.0-alpha</hadoop.version>
++        <hadoop.version>2.2.0</hadoop.version>
+         <slf4j.version>1.6.1</slf4j.version>
+       </properties>
+       <dependencies>]]>
+                   </programlisting>
+                  <para>The next step is to regenerate Protobuf files and assuming
that the Protobuf
+                    has been installed:</para>
+                  <itemizedlist>
+                    <listitem>
+                      <para>Go to the hbase root folder, using the command line;</para>
+                    </listitem>
+                    <listitem>
+                      <para>Type the following commands:</para>
+                      <para>
+                        <programlisting language="bourne"><![CDATA[$ protoc -Isrc/main/protobuf
--java_out=src/main/java src/main/protobuf/hbase.proto]]></programlisting>
+                      </para>
+                      <para>
+                        <programlisting language="bourne"><![CDATA[$ protoc -Isrc/main/protobuf
--java_out=src/main/java src/main/protobuf/ErrorHandling.proto]]></programlisting>
+                      </para>
+                    </listitem>
+                  </itemizedlist>
+                  <para> Building against the hadoop 2 profile by running something
like the
+                    following command: </para>
+                  <screen language="bourne">$  mvn clean install assembly:single -Dhadoop.profile=2.0
-DskipTests</screen>
+      </section>
+      <section
         xml:id="hadoop.hbase-0.94">
         <title>Apache HBase 0.92 and 0.94</title>
         <para>HBase 0.92 and 0.94 versions can work with Hadoop versions, 0.20.205,
0.22.x, 1.0.x,


Mime
View raw message