From 2a5e5e9e2c0e1a2f8cdb67783c78ba29695604b9 Mon Sep 17 00:00:00 2001 From: Apekshit Sharma Date: Sun, 17 Dec 2017 19:10:04 -0800 Subject: [PATCH] HBASE-19526 Update hadoop version to 3.0 GA --- 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(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 2d6c82605b..f33faea5a2 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}" diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index af193c6539..05db2745e2 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. - + com.codahale.metrics metrics-core 3.0.1 @@ -615,7 +615,7 @@ under the License. - + com.squareup.okhttp okhttp 2.4.0 @@ -629,7 +629,7 @@ under the License. - + com.squareup.okio okio 1.4.0 @@ -644,7 +644,7 @@ under the License. - + de.ruedigermoeller fst 2.24 @@ -663,7 +663,7 @@ under the License. - + org.objenesis objenesis 2.1 @@ -800,7 +800,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + org.codehaus.woodstox stax2-api 3.1.4 diff --git a/pom.xml b/pom.xml index 84adee50a0..fb8aefb9f4 100755 --- a/pom.xml +++ b/pom.xml @@ -1402,7 +1402,7 @@ ${compileSource} 2.7.4 - 3.0.0-beta1 + 3.0.0 diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index 86b722aa69..4ed7254e16 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: ---- - + [[distributed]] === Distributed diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index a812aa642e..dbc2a7cdc3 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 -- 2.14.1