From 51c49a17845bdaf4356c1b53d1650cd52c3c9fc5 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Fri, 31 May 2019 19:51:20 -0500 Subject: [PATCH] HBASE-22497 Mark HBase 1.2 line as EOM Signed-off-by: Duo Zhang --- dev-support/checkcompatibility.py | 12 +++++----- .../apache/hadoop/hbase/util/VersionInfo.java | 2 +- .../hadoop/hbase/client/VersionInfoUtil.java | 2 +- src/main/asciidoc/_chapters/community.adoc | 3 --- src/main/asciidoc/_chapters/upgrading.adoc | 4 ++-- src/site/site.xml | 5 ----- src/site/xdoc/downloads.xml | 22 ------------------- 7 files changed, 10 insertions(+), 40 deletions(-) diff --git a/dev-support/checkcompatibility.py b/dev-support/checkcompatibility.py index d132c350a9a..b764aaaec17 100755 --- a/dev-support/checkcompatibility.py +++ b/dev-support/checkcompatibility.py @@ -32,7 +32,7 @@ # --annotation org.apache.yetus.audience.InterfaceAudience.LimitedPrivate \ # --include-file "hbase-*" \ # --known_problems_path ~/known_problems.json \ -# rel/1.0.0 branch-1.2 +# rel/1.3.0 branch-1.4 import json import logging @@ -325,14 +325,14 @@ def get_known_problems(json_path, src_rev, dst_rev): keys in the format source_branch/destination_branch and the values dictionaries with binary and source problems and warnings Example: - {'branch-1.0.0': { - 'rel/1.0.0': {'binary': {'problems': 123, 'warnings': 16}, + {'branch-1.3': { + 'rel/1.3.0': {'binary': {'problems': 123, 'warnings': 16}, 'source': {'problems': 167, 'warnings': 1}}, - 'branch-1.2.0': {'binary': {'problems': 0, 'warnings': 0}, + 'branch-1.4': {'binary': {'problems': 0, 'warnings': 0}, 'source': {'problems': 0, 'warnings': 0}} }, - 'branch-1.2.0': { - 'rel/1.2.1': {'binary': {'problems': 13, 'warnings': 1}, + 'branch-1.4': { + 'rel/1.4.1': {'binary': {'problems': 13, 'warnings': 1}, 'source': {'problems': 23, 'warnings': 0}} } } """ diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java index b57255aeed6..d666fb2ebaa 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java @@ -135,7 +135,7 @@ public class VersionInfo { /** * Returns the version components as String objects - * Examples: "1.2.3" returns ["1", "2", "3"], "4.5.6-SNAPSHOT" returns ["4", "5", "6", "-1"] + * Examples: "1.4.3" returns ["1", "4", "3"], "4.5.6-SNAPSHOT" returns ["4", "5", "6", "-1"] * "4.5.6-beta" returns ["4", "5", "6", "-2"], "4.5.6-alpha" returns ["4", "5", "6", "-3"] * "4.5.6-UNKNOW" returns ["4", "5", "6", "-4"] * @return the components of the version string diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java index 14369458712..0f190f8ce33 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java @@ -148,7 +148,7 @@ public final class VersionInfoUtil { /** * Returns the version components - * Examples: "1.2.3" returns [1, 2, 3], "4.5.6-SNAPSHOT" returns [4, 5, 6, "SNAPSHOT"] + * Examples: "1.4.3" returns [1, 4, 3], "4.5.6-SNAPSHOT" returns [4, 5, 6, "SNAPSHOT"] * @returns the components of the version string */ private static String[] getVersionComponents(final HBaseProtos.VersionInfo versionInfo) { diff --git a/src/main/asciidoc/_chapters/community.adoc b/src/main/asciidoc/_chapters/community.adoc index 3a429d6fb71..15e106e8b1f 100644 --- a/src/main/asciidoc/_chapters/community.adoc +++ b/src/main/asciidoc/_chapters/community.adoc @@ -82,9 +82,6 @@ NOTE: End-of-life releases are not included in this list. | Release | Release Manager -| 1.2 -| Sean Busbey - | 1.3 | Mikhail Antonov diff --git a/src/main/asciidoc/_chapters/upgrading.adoc b/src/main/asciidoc/_chapters/upgrading.adoc index 5025cb44b09..b20a2b25b6a 100644 --- a/src/main/asciidoc/_chapters/upgrading.adoc +++ b/src/main/asciidoc/_chapters/upgrading.adoc @@ -162,7 +162,7 @@ HBase Private API:: [[hbase.binary.compatibility]] .Binary Compatibility -When we say two HBase versions are compatible, we mean that the versions are wire and binary compatible. Compatible HBase versions means that clients can talk to compatible but differently versioned servers. It means too that you can just swap out the jars of one version and replace them with the jars of another, compatible version and all will just work. Unless otherwise specified, HBase point versions are (mostly) binary compatible. You can safely do rolling upgrades between binary compatible versions; i.e. across maintenance releases: e.g. from 1.2.4 to 1.2.6. See link:[Does compatibility between versions also mean binary compatibility?] discussion on the HBase dev mailing list. +When we say two HBase versions are compatible, we mean that the versions are wire and binary compatible. Compatible HBase versions means that clients can talk to compatible but differently versioned servers. It means too that you can just swap out the jars of one version and replace them with the jars of another, compatible version and all will just work. Unless otherwise specified, HBase point versions are (mostly) binary compatible. You can safely do rolling upgrades between binary compatible versions; i.e. across maintenance releases: e.g. from 1.4.4 to 1.4.6. See link:[Does compatibility between versions also mean binary compatibility?] discussion on the HBase dev mailing list. [[hbase.rolling.upgrade]] === Rolling Upgrades @@ -180,7 +180,7 @@ The rolling-restart script will first gracefully stop and restart the master, an [[hbase.rolling.restart]] .Rolling Upgrade Between Versions that are Binary/Wire Compatible -Unless otherwise specified, HBase minor versions are binary compatible. You can do a <> between HBase point versions. For example, you can go to 1.2.4 from 1.2.6 by doing a rolling upgrade across the cluster replacing the 1.2.4 binary with a 1.2.6 binary. +Unless otherwise specified, HBase minor versions are binary compatible. You can do a <> between HBase point versions. For example, you can go to 1.4.4 from 1.4.6 by doing a rolling upgrade across the cluster replacing the 1.4.4 binary with a 1.4.6 binary. In the minor version-particular sections below, we call out where the versions are wire/protocol compatible and in this case, it is also possible to do a <>. diff --git a/src/site/site.xml b/src/site/site.xml index a46841695d9..e6a8cfaf23e 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -126,11 +126,6 @@ - - - - - diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml index 2c51d1b0c39..b98a6f2d338 100644 --- a/src/site/xdoc/downloads.xml +++ b/src/site/xdoc/downloads.xml @@ -133,28 +133,6 @@ under the License. - - - 1.2.12 - - - 2019/04/17 - - - 1.2.11 vs 1.2.12 - - - Changes - - - Release Notes - - - src (sha512 asc)
- bin (sha512 asc) - - -