This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new f0a3959 HBASE-26005 Update ref guide about the EOL for 2.2.x (#3388)
f0a3959 is described below
commit f0a39590d01b61c43d913d855e40b6771dae3e66
Author: GeorryHuang <[email protected]>
AuthorDate: Sat Jun 19 00:06:37 2021 +0800
HBASE-26005 Update ref guide about the EOL for 2.2.x (#3388)
Signed-off-by: Duo Zhang <[email protected]>
---
src/main/asciidoc/_chapters/community.adoc | 7 ++----
src/main/asciidoc/_chapters/configuration.adoc | 32 +++++++++++---------------
src/site/site.xml | 8 -------
3 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/src/main/asciidoc/_chapters/community.adoc
b/src/main/asciidoc/_chapters/community.adoc
index 6af5d48..e8a7ef3 100644
--- a/src/main/asciidoc/_chapters/community.adoc
+++ b/src/main/asciidoc/_chapters/community.adoc
@@ -52,8 +52,8 @@ resolve an issue. If master is going to be 3.0.0, branch-2
will be 2.4.0, and br
2.x+): Mark with 3.0.0 and 2.4.0
* Commit to master, branch-2, and branch-1 (i.e., backward-compatible new
feature, applicable
everywhere): Mark with 3.0.0, 2.4.0, and 1.7.0
-* Commit to master, branch-2, and branch-2.3, branch-2.2, branch-2, branch-1.4
(i.e., bug fix
- applicable to all active release lines): Mark with 3.0.0, 2.4.0, 2.3.x,
2.2.x, 1.7.0, and 1.4.x
+* Commit to master, branch-2, and branch-2.3, branch-1, branch-1.4 (i.e., bug
fix
+ applicable to all active release lines): Mark with 3.0.0, 2.4.0, 2.3.x,
1.7.0, and 1.4.x
* Commit a fix to the website: no version
[[hbase.when.to.close.jira]]
@@ -90,9 +90,6 @@ NOTE: End-of-life releases are not included in this list.
| 1.4
| Andrew Purtell
-| 2.2
-| Guanghao Zhang
-
| 2.3
| Nick Dimiduk
diff --git a/src/main/asciidoc/_chapters/configuration.adoc
b/src/main/asciidoc/_chapters/configuration.adoc
index 069f4aa..71b2ba3 100644
--- a/src/main/asciidoc/_chapters/configuration.adoc
+++ b/src/main/asciidoc/_chapters/configuration.adoc
@@ -130,26 +130,22 @@ JVM. When selecting your JDK distribution, please take
this into consideration.
====
.Java support by release line
-[cols="4*^.^", options="header"]
+[cols="3*^.^", options="header"]
|===
|Java Version
|HBase 1.4+
-|HBase 2.2+
|HBase 2.3+
|JDK7
|icon:check-circle[role="green"]
|icon:times-circle[role="red"]
-|icon:times-circle[role="red"]
|JDK8
|icon:check-circle[role="green"]
|icon:check-circle[role="green"]
-|icon:check-circle[role="green"]
|JDK11
|icon:times-circle[role="red"]
-|icon:times-circle[role="red"]
|icon:exclamation-circle[role="yellow"]*
|===
@@ -293,20 +289,20 @@ Use the following legend to interpret this table:
link:https://hadoop.apache.org/cve_list.html[CVEs] so we drop the support in
newer minor releases
* icon:exclamation-circle[role="yellow"] = Not tested, may/may-not function
-[cols="1,5*^.^", options="header"]
+[cols="1,4*^.^", options="header"]
|===
-| | HBase-1.4.x | HBase-1.6.x | HBase-1.7.x | HBase-2.2.x | HBase-2.3.x
-|Hadoop-2.7.0 | icon:times-circle[role="red"] | icon:times-circle[role="red"]
| icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"]
-|Hadoop-2.7.1+ | icon:check-circle[role="green"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"]
-|Hadoop-2.8.[0-2] | icon:times-circle[role="red"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"]
-|Hadoop-2.8.[3-4] | icon:exclamation-circle[role="yellow"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"]
-|Hadoop-2.8.5+ | icon:exclamation-circle[role="yellow"] |
icon:check-circle[role="green"] | icon:times-circle[role="red"] |
icon:check-circle[role="green"] | icon:times-circle[role="red"]
-|Hadoop-2.9.[0-1] | icon:times-circle[role="red"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"]
-|Hadoop-2.9.2+ | icon:exclamation-circle[role="yellow"] |
icon:check-circle[role="green"] | icon:times-circle[role="red"] |
icon:check-circle[role="green"] | icon:times-circle[role="red"]
-|Hadoop-2.10.x | icon:exclamation-circle[role="yellow"] |
icon:check-circle[role="green"] | icon:check-circle[role="green"] |
icon:exclamation-circle[role="yellow"] | icon:check-circle[role="green"]
-|Hadoop-3.1.0 | icon:times-circle[role="red"] | icon:times-circle[role="red"]
| icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"]
-|Hadoop-3.1.1+ | icon:times-circle[role="red"] | icon:times-circle[role="red"]
| icon:times-circle[role="red"] | icon:check-circle[role="green"] |
icon:check-circle[role="green"]
-|Hadoop-3.2.x | icon:times-circle[role="red"] | icon:times-circle[role="red"]
| icon:times-circle[role="red"] | icon:check-circle[role="green"] |
icon:check-circle[role="green"]
+| | HBase-1.4.x | HBase-1.6.x | HBase-1.7.x | HBase-2.3.x
+|Hadoop-2.7.0 | icon:times-circle[role="red"] | icon:times-circle[role="red"]
| icon:times-circle[role="red"] | icon:times-circle[role="red"]
+|Hadoop-2.7.1+ | icon:check-circle[role="green"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"]
+|Hadoop-2.8.[0-2] | icon:times-circle[role="red"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"]
+|Hadoop-2.8.[3-4] | icon:exclamation-circle[role="yellow"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"]
+|Hadoop-2.8.5+ | icon:exclamation-circle[role="yellow"] |
icon:check-circle[role="green"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"]
+|Hadoop-2.9.[0-1] | icon:times-circle[role="red"] |
icon:times-circle[role="red"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"]
+|Hadoop-2.9.2+ | icon:exclamation-circle[role="yellow"] |
icon:check-circle[role="green"] | icon:times-circle[role="red"] |
icon:times-circle[role="red"]
+|Hadoop-2.10.x | icon:exclamation-circle[role="yellow"] |
icon:check-circle[role="green"] | icon:check-circle[role="green"] |
icon:check-circle[role="green"]
+|Hadoop-3.1.0 | icon:times-circle[role="red"] | icon:times-circle[role="red"]
| icon:times-circle[role="red"] | icon:times-circle[role="red"]
+|Hadoop-3.1.1+ | icon:times-circle[role="red"] | icon:times-circle[role="red"]
| icon:times-circle[role="red"] | icon:check-circle[role="green"]
+|Hadoop-3.2.x | icon:times-circle[role="red"] | icon:times-circle[role="red"]
| icon:times-circle[role="red"] | icon:check-circle[role="green"]
|===
.Hadoop 2.y.0 Releases
diff --git a/src/site/site.xml b/src/site/site.xml
index 4787784..22490bd 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -125,14 +125,6 @@
<item name="User API" href="1.4/apidocs/index.html" target="_blank" />
<item name="Developer API" href="1.4/devapidocs/index.html"
target="_blank" />
</item>
- <item name="2.2 Documentation">
- <item name="Ref Guide" href="2.2/book.html" target="_blank" />
- <item name="Reference Guide (PDF)"
href="2.2/apache_hbase_reference_guide.pdf" target="_blank" />
- <item name="User API" href="2.2/apidocs/index.html" target="_blank" />
- <item name="User API (Test)" href="2.2/testapidocs/index.html"
target="_blank" />
- <item name="Developer API" href="2.2/devapidocs/index.html"
target="_blank" />
- <item name="Developer API (Test)" href="2.2/testdevapidocs/index.html"
target="_blank" />
- </item>
<item name="2.3 Documentation">
<item name="Ref Guide" href="2.3/book.html" target="_blank" />
<item name="Reference Guide (PDF)"
href="2.3/apache_hbase_reference_guide.pdf" target="_blank" />
