You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/12/18 06:37:01 UTC

hbase git commit: HBASE-19526 Update hadoop version to 3.0 GA

Repository: hbase
Updated Branches:
  refs/heads/master 26b69dc45 -> 2a5e5e9e2


HBASE-19526 Update hadoop version to 3.0 GA


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

Branch: refs/heads/master
Commit: 2a5e5e9e2c0e1a2f8cdb67783c78ba29695604b9
Parents: 26b69dc
Author: Apekshit Sharma <ap...@apache.org>
Authored: Sun Dec 17 19:10:04 2017 -0800
Committer: Apekshit Sharma <ap...@apache.org>
Committed: Sun Dec 17 19:10:04 2017 -0800

----------------------------------------------------------------------
 dev-support/hbase-personality.sh                        |  2 +-
 .../src/main/resources/supplemental-models.xml          | 12 ++++++------
 pom.xml                                                 |  2 +-
 src/main/asciidoc/_chapters/configuration.adoc          |  6 +++---
 src/main/asciidoc/_chapters/developer.adoc              |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2a5e5e9e/dev-support/hbase-personality.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 2d6c826..f33faea 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -300,7 +300,7 @@ function hadoopcheck_rebuild
     else
       hbase_hadoop2_versions="${hbase_common_hadoop2_versions}"
     fi
-    hbase_hadoop3_versions="3.0.0-beta1"
+    hbase_hadoop3_versions="3.0.0"
   fi
 
   export MAVEN_OPTS="${MAVEN_OPTS}"

http://git-wip-us.apache.org/repos/asf/hbase/blob/2a5e5e9e/hbase-resource-bundle/src/main/resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index af193c6..05db274 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -601,7 +601,7 @@ under the License.
   </supplement>
 
   <supplement>
-    <project>   <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
+    <project>   <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
       <groupId>com.codahale.metrics</groupId>
       <artifactId>metrics-core</artifactId>
       <version>3.0.1</version>
@@ -615,7 +615,7 @@ under the License.
     </project>
   </supplement>
   <supplement>
-    <project>  <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
+    <project>  <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
       <groupId>com.squareup.okhttp</groupId>
       <artifactId>okhttp</artifactId>
       <version>2.4.0</version>
@@ -629,7 +629,7 @@ under the License.
     </project>
   </supplement>
   <supplement>
-    <project>  <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
+    <project>  <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
       <groupId>com.squareup.okio</groupId>
       <artifactId>okio</artifactId>
       <version>1.4.0</version>
@@ -644,7 +644,7 @@ under the License.
   </supplement>
 
   <supplement>
-    <project>   <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
+    <project>   <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
       <groupId>de.ruedigermoeller</groupId>
       <artifactId>fst</artifactId>
       <version>2.24</version>
@@ -663,7 +663,7 @@ under the License.
   </supplement>
 
   <supplement>
-    <project>   <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
+    <project>   <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>
       <version>2.1</version>
@@ -800,7 +800,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     </project>
   </supplement>
   <supplement>
-    <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-beta1 -->
+    <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>stax2-api</artifactId>
       <version>3.1.4</version>

http://git-wip-us.apache.org/repos/asf/hbase/blob/2a5e5e9e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84adee5..fb8aefb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1402,7 +1402,7 @@
     <java.min.version>${compileSource}</java.min.version>
     <!-- Dependencies -->
     <hadoop-two.version>2.7.4</hadoop-two.version>
-    <hadoop-three.version>3.0.0-beta1</hadoop-three.version>
+    <hadoop-three.version>3.0.0</hadoop-three.version>
     <!-- These must be defined here for downstream build tools that don't look at profiles.
          They ought to match the values found in our default hadoop profile, which is
          currently "hadoop-2.0". See HBASE-15925 for more info. -->

http://git-wip-us.apache.org/repos/asf/hbase/blob/2a5e5e9e/src/main/asciidoc/_chapters/configuration.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc
index 86b722a..4ed7254 100644
--- a/src/main/asciidoc/_chapters/configuration.adoc
+++ b/src/main/asciidoc/_chapters/configuration.adoc
@@ -176,7 +176,7 @@ Linux Shell::
 
 Windows::
   Prior to HBase 0.96, running HBase on Microsoft Windows was limited only for testing purposes.
-  Running production systems on Windows machines is not recommended. 
+  Running production systems on Windows machines is not recommended.
 
 
 [[hadoop]]
@@ -221,7 +221,7 @@ Use the following legend to interpret this table:
 |Hadoop-2.7.1+ | NT | S | S | S
 |Hadoop-2.8.0 | X | X | X | X
 |Hadoop-2.8.1 | X | X | X | X
-|Hadoop-3.0.0-alphax | NT | NT | NT | NT
+|Hadoop-3.0.0 | NT | NT | NT | NT
 |===
 
 .Hadoop Pre-2.6.1 and JDK 1.8 Kerberos
@@ -349,7 +349,7 @@ to _false_. For example:
   </property>
 </configuration>
 ----
- 
+
 [[distributed]]
 === Distributed
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/2a5e5e9e/src/main/asciidoc/_chapters/developer.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc
index a812aa6..dbc2a7c 100644
--- a/src/main/asciidoc/_chapters/developer.adoc
+++ b/src/main/asciidoc/_chapters/developer.adoc
@@ -402,7 +402,7 @@ mvn -Dhadoop.profile=3.0 ...
 The above will build against whatever explicit hadoop 3.y version we have in our _pom.xml_ as our '3.0' version.
 Tests may not all pass so you may need to pass `-DskipTests` unless you are inclined to fix the failing tests.
 
-To pick a particular Hadoop 3.y release, you'd set e.g. `-Dhadoop-three.version=3.0.0-alpha1`.
+To pick a particular Hadoop 3.y release, you'd set hadoop-three.version property e.g. `-Dhadoop-three.version=3.0.0`.
 
 [[build.protobuf]]
 ==== Build Protobuf