Repository: hbase Updated Branches: refs/heads/branch-2 231ec7e83 -> 6616a3fd2
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/6616a3fd Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6616a3fd Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6616a3fd Branch: refs/heads/branch-2 Commit: 6616a3fd2d8a33b426b8bc7495bd59e8cf511715 Parents: 231ec7e Author: Apekshit Sharma <[email protected]> Authored: Sun Dec 17 19:10:04 2017 -0800 Committer: Apekshit Sharma <[email protected]> Committed: Sun Dec 17 22:52:54 2017 -0800 ---------------------------------------------------------------------- dev-support/hbase-personality.sh | 2 +- .../src/main/resources/supplemental-models.xml | 24 ++++++++++---------- pom.xml | 2 +- src/main/asciidoc/_chapters/configuration.adoc | 5 ++-- src/main/asciidoc/_chapters/developer.adoc | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6616a3fd/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/6616a3fd/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 08f97fe..00d4ece 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -1126,7 +1126,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>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> <version>1.0</version> @@ -1211,7 +1211,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>org.apache.curator</groupId> <artifactId>curator-test</artifactId> <version>2.7.1</version> @@ -1296,7 +1296,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>org.apache.htrace</groupId> <artifactId>htrace-core4</artifactId> <version>4.0.1-incubating</version> @@ -1612,7 +1612,7 @@ Copyright 2006 Envoi Solutions LLC </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.codahale.metrics</groupId> <artifactId>metrics-core</artifactId> <version>3.0.1</version> @@ -1626,7 +1626,7 @@ Copyright 2006 Envoi Solutions LLC </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.nimbusds</groupId> <artifactId>nimbus-jose-jwt</artifactId> <version>3.9</version> @@ -1640,7 +1640,7 @@ Copyright 2006 Envoi Solutions LLC </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> @@ -1654,7 +1654,7 @@ Copyright 2006 Envoi Solutions LLC </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> @@ -1668,7 +1668,7 @@ Copyright 2006 Envoi Solutions LLC </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.twitter</groupId> <artifactId>hpack</artifactId> <version>0.11.0</version> @@ -1682,7 +1682,7 @@ Copyright 2006 Envoi Solutions LLC </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>net.minidev</groupId> <artifactId>json-smart</artifactId> <version>1.1.1</version> @@ -1697,7 +1697,7 @@ Copyright 2006 Envoi Solutions LLC </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> @@ -1716,7 +1716,7 @@ Copyright 2006 Envoi Solutions LLC </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> @@ -1867,7 +1867,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/6616a3fd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c25c55b..cba3e16 100644 --- a/pom.xml +++ b/pom.xml @@ -1313,7 +1313,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/6616a3fd/src/main/asciidoc/_chapters/configuration.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index 66530a9..6757f81 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -221,7 +221,8 @@ Use the following legend to interpret this table: |Hadoop-2.7.0 | X | X | X | X |Hadoop-2.7.1+ | NT | S | S | S |Hadoop-2.8.0 | X | X | X | X -|Hadoop-3.0.0-alphax | NT | NT | NT | NT +|Hadoop-2.8.1 | X | X | X | X +|Hadoop-3.0.0 | NT | NT | NT | NT |=== .Hadoop Pre-2.6.1 and JDK 1.8 Kerberos @@ -349,7 +350,7 @@ to _false_. For example: </property> </configuration> ---- - + [[distributed]] === Distributed http://git-wip-us.apache.org/repos/asf/hbase/blob/6616a3fd/src/main/asciidoc/_chapters/developer.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index c3bacaf..6dbf56d 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
