This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new ea0cd0c Update EOL date for 2.5.x
ea0cd0c is described below
commit ea0cd0c01630029ab88fa075db0c37e35c55f051
Author: Huxing Zhang <[email protected]>
AuthorDate: Tue Mar 26 22:21:45 2019 +0800
Update EOL date for 2.5.x
---
docs/en-us/developers/user-guide/faq_dev.md | 2 +-
docs/zh-cn/developers/user-guide/faq_dev.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/en-us/developers/user-guide/faq_dev.md
b/docs/en-us/developers/user-guide/faq_dev.md
index 29ebca3..b039c05 100644
--- a/docs/en-us/developers/user-guide/faq_dev.md
+++ b/docs/en-us/developers/user-guide/faq_dev.md
@@ -12,7 +12,7 @@ Currently, dubbo keeps 3 versions evolve in parallel:
* 2.6.x: requires Java 1.6, minor feature & bugfix branch, GA, production
ready.
-* 2.5.x: requires Java 1.6, maintenance branch, only accept security
vulnerability and critical bugfix, expected to be EOL soon.
+* 2.5.x: requires Java 1.6, maintenance branch, only accept security
vulnerability and critical bugfix, the support will end on 2019-6-15, please
upgrade to 2.6.x as soon as possible.
check [this](https://github.com/apache/incubator-dubbo/issues/1208) for
detailed version management plan.
diff --git a/docs/zh-cn/developers/user-guide/faq_dev.md
b/docs/zh-cn/developers/user-guide/faq_dev.md
index 35c4c0a..bf45ab9 100644
--- a/docs/zh-cn/developers/user-guide/faq_dev.md
+++ b/docs/zh-cn/developers/user-guide/faq_dev.md
@@ -10,7 +10,7 @@
* 2.7.x (master) :要求java 1.8,重要功能分支。
* 2.6.x:要求java 1.6,次要功能、bug修复分支,GA,生产准备。
-* 2.5.x:要求java 1.6,维护分支,只接受具有安全漏洞和致命性错误的bugfix,该分支预计很快就会停止维护
+* 2.5.x:要求java
1.6,维护分支,只接受具有安全漏洞和致命性错误的bugfix,该分支将会在2019-06-15停止维护,请尽快升级到2.6.x版本。
点击[这里](https://github.com/apache/incubator-dubbo/issues/1208)以了解更详细的版本管理计划。