You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/07/04 02:18:28 UTC
[doris] branch master updated: [community] modify release doc to remove incubator (#10574)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new c5f85c9818 [community] modify release doc to remove incubator (#10574)
c5f85c9818 is described below
commit c5f85c98184bc12adc0570de4d5837058663bf49
Author: Mingyu Chen <mo...@gmail.com>
AuthorDate: Mon Jul 4 10:18:23 2022 +0800
[community] modify release doc to remove incubator (#10574)
---
.../release-and-verify/release-complete.md | 68 +++++++-------------
.../release-and-verify/release-doris-connectors.md | 74 +++++-----------------
.../release-and-verify/release-prepare.md | 21 +++---
.../release-and-verify/release-complete.md | 68 +++++++-------------
.../release-and-verify/release-doris-connectors.md | 74 +++++-----------------
.../release-and-verify/release-prepare.md | 19 +++---
6 files changed, 95 insertions(+), 229 deletions(-)
diff --git a/docs/en/community/release-and-verify/release-complete.md b/docs/en/community/release-and-verify/release-complete.md
index e9db21ce84..71dfb22227 100644
--- a/docs/en/community/release-and-verify/release-complete.md
+++ b/docs/en/community/release-and-verify/release-complete.md
@@ -26,29 +26,29 @@ under the License.
# Complete release
-The steps in this document follow after the release has been voted on and approved in the dev@doris or general@incubator mail groups.
+The steps in this document follow after the release has been voted on and approved in the dev@doris.
## Upload package to release
When the official release poll is successful, send the [Result] email first, then prepare the release package.
-Copy the source package, signature file and hash file from the corresponding folder of the previous release under dev to another directory 0.9.0-incubating, note that the file name should not be rcxx (you can rename, but do not recalculate the signature, the hash can be recalculated, the result will not change)
+Copy the source package, signature file and hash file from the corresponding folder of the previous release under dev to another directory 1.xx, note that the file name should not be rcxx (you can rename, but do not recalculate the signature, the hash can be recalculated, the result will not change)
```
From:
-https://dist.apache.org/repos/dist/dev/incubator/doris/
+https://dist.apache.org/repos/dist/dev/doris/
To:
-https://dist.apache.org/repos/dist/release/incubator/doris/
+https://dist.apache.org/repos/dist/release/doris/
```
For the first release, you need to copy the KEYS file as well. Then add it to the svn release.
```
add 成功后就可以在下面网址上看到你发布的文件
-https://dist.apache.org/repos/dist/release/incubator/doris/0.xx.0-incubating/
+https://dist.apache.org/repos/dist/release/doris/1.xx/
稍等一段时间后，能在 apache 官网看到：
-http://www.apache.org/dist/incubator/doris/0.9.0-incubating/
+http://www.apache.org/dist/doris/1.xx/
```
## Post links on Doris official website and github
@@ -60,35 +60,35 @@ We will use Doris Core as an example. For other components, replace the name wit
Download Link:
```
-http://www.apache.org/dyn/closer.cgi?filename=incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz&action=download
+http://www.apache.org/dyn/closer.cgi?filename=doris/1.xx/apache-doris-1.xx-src.tar.gz&action=download
-wget --trust-server-names "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz"
+wget --trust-server-names "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=doris/1.xx/apache-doris-1.xx-src.tar.gz"
```
Original Location:
```
-https://www.apache.org/dist/incubator/doris/0.9.0-incubating/
+https://www.apache.org/dist/doris/1.xx/
-http://www.apache.org/dyn/closer.cgi/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz
+http://www.apache.org/dyn/closer.cgi/doris/1.xx/apache-doris-1.xx-src.tar.gz
```
Ssource package:
```
-http://www.apache.org/dyn/closer.cgi/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz
+http://www.apache.org/dyn/closer.cgi/doris/1.xx/apache-doris-1.xx-src.tar.gz
ASC:
-http://archive.apache.org/dist/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz.asc
+http://archive.apache.org/dist/doris/1.xx/apache-doris-1.xx-src.tar.gz.asc
sha512:
-http://archive.apache.org/dist/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz.sha512
+http://archive.apache.org/dist/doris/1.xx/apache-doris-1.xx-src.tar.gz.sha512
```
KEYS:
```
-http://archive.apache.org/dist/incubator/doris/KEYS
+http://archive.apache.org/dist/doris/KEYS
```
refer to: <http://www.apache.org/dev/release-download-pages#closer>
@@ -104,7 +104,7 @@ The following two places need to be modified.
1. Github's release page
```
-https://github.com/apache/incubator-doris/releases/tag/0.9.0-rc01
+https://github.com/apache/doris/releases/tag/0.9.0-rc01
```
2、Doris official website download page
@@ -126,8 +126,8 @@ docs/en/downloads/downloads.md
Since svn only needs to keep the latest version of packages, old versions of packages should be cleaned from svn when a new version is released.
```
-https://dist.apache.org/repos/dist/release/incubator/doris/
-https://dist.apache.org/repos/dist/dev/incubator/doris/
+https://dist.apache.org/repos/dist/release/doris/
+https://dist.apache.org/repos/dist/dev/doris/
```
Keep these two addresses with only the latest package versions. 2.
@@ -136,7 +136,7 @@ Keep these two addresses with only the latest package versions. 2.
```
Download page: http://doris.apache.org/downloads.html
-Archive page: http://archive.apache.org/dist/incubator/doris
+Archive page: http://archive.apache.org/dist/doris
```
Apache has a synchronization mechanism to archive the history of releases, see [how to archive](https://www.apache.org/legal/release-policy.html#how-to-archive)
@@ -147,7 +147,7 @@ So even if an old package is removed from svn, it can still be found on the arch
Title:
```
-[ANNOUNCE] Apache Doris (incubating) 0.9.0 Release
+[ANNOUNCE] Apache Doris 1.xx release
```
To mail：
@@ -156,47 +156,23 @@ To mail：
dev@doris.apache.org
```
-Incubator projects, which also need to be sent to:
-
-```
-general@incubator.apache.org
-```
-
Email body:
```
Hi All,
-We are pleased to announce the release of Apache Doris 0.9.0-incubating.
+We are pleased to announce the release of Apache Doris 1.xx.
-Apache Doris (incubating) is an MPP-based interactive SQL data warehousing for reporting and analysis.
+Apache Doris is an MPP-based interactive SQL data warehousing for reporting and analysis.
The release is available at:
http://doris.apache.org/master/zh-CN/downloads/downloads.html
Thanks to everyone who has contributed to this release, and the release note can be found here:
-https://github.com/apache/incubator-doris/releases
+https://github.com/apache/doris/releases
Best Regards,
On behalf of the Doris team,
xxx
----
-DISCLAIMER:
-Apache Doris (incubating) is an effort undergoing incubation at The
-Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted
-projects until a further review indicates that the
-infrastructure, communications, and decision making process have
-stabilized in a manner consistent with other successful ASF
-projects.
-
-While incubation status is not necessarily a reflection
-of the completeness or stability of the code, it does indicate
-that the project has yet to be fully endorsed by the ASF.
-```
-
-
-
diff --git a/docs/en/community/release-and-verify/release-doris-connectors.md b/docs/en/community/release-and-verify/release-doris-connectors.md
index cc93d9573f..2ca227c22b 100644
--- a/docs/en/community/release-and-verify/release-doris-connectors.md
+++ b/docs/en/community/release-and-verify/release-doris-connectors.md
@@ -33,8 +33,8 @@ Doris Connectors currently contains:
The code base is separate from the main Doris code base and is located at:
-- https://github.com/apache/incubator-doris-flink-connector
-- https://github.com/apache/incubator-doris-spark-connector
+- https://github.com/apache/doris-flink-connector
+- https://github.com/apache/doris-spark-connector
## Preparing for release
@@ -100,7 +100,7 @@ Once the local tag is verified, you need to push the tag to the repository.
`git push upstream --tags`
-where upstream points to the `apache/incubator-doris-flink-connector` repository.
+where upstream points to the `apache/doris-flink-connector` repository.
Finally, execute perform:
@@ -123,26 +123,26 @@ After checking, click the `close` button in the figure to finish staging release
Check out the svn repository.
```
-svn co https://dist.apache.org/repos/dist/dev/incubator/doris/
+svn co https://dist.apache.org/repos/dist/dev/doris/
```
Package the tag source code and generate the signature file and sha256 checksum file. Here we take `1.14_2.12-1.0.0` as an example.
```
-git archive --format=tar 1.14_2.12-1.0.0 --prefix=apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src/ | gzip > apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz
-gpg -u xxx@apache.org --armor --output apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.asc --detach-sign apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz
-sha512sum apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz > apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.sha512
+git archive --format=tar 1.14_2.12-1.0.0 --prefix=apache-doris-flink-connector-1.14_2.12-1.0.0-src/ | gzip > apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz
+gpg -u xxx@apache.org --armor --output apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.asc --detach-sign apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz
+sha512sum apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz > apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.sha512
Mac:
-shasum -a 512 apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz > apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.sha512
+shasum -a 512 apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz > apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.sha512
```
The end result is three files:
```
-apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz
-apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.asc
-apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.sha512
+apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz
+apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.asc
+apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.sha512
```
Move these three files to the svn directory:
@@ -178,27 +178,27 @@ Initiate a poll in the dev@doris mailgroup, with the following template.
```
Hi All,
-This is a call for vote to release Flink Connectors v1.0.0 for Apache Doris(Incubating).
+This is a call for vote to release Flink Connectors v1.0.0 for Apache Doris
-- apache-doris-flink-connector-1.14_2.12-1.0.0-incubating
+- apache-doris-flink-connector-1.14_2.12-1.0.0
The release node:
xxxxx
The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/doris/flink-connector/1.0.0/
+https://dist.apache.org/repos/dist/dev/doris/flink-connector/1.0.0/
Maven 2 staging repository:
https://repository.apache.org/content/repositories/orgapachedoris-1002/org/apache/doris/doris-flink-connector/
Git tag for the release:
-https://github.com/apache/incubator-doris-flink-connector/tree/1.14_2.12-1.0.0
+https://github.com/apache/doris-flink-connector/tree/1.14_2.12-1.0.0
Keys to verify the Release Candidate:
-https://downloads.apache.org/incubator/doris/KEYS
+https://downloads.apache.org/doris/KEYS
Look at here for how to verify this release candidate:
-http://doris.incubator.apache.org/community/release-and-verify/release-verify.html
+http://doris.apache.org/community/release-and-verify/release-verify.html
The vote will be open for at least 72 hours or until necessary number of votes are reached.
@@ -209,46 +209,6 @@ Please vote accordingly:
[ ] -1 disapprove with the reason
```
-After the dev mail group is approved, send an email to the general@incubator mail group for IPMC voting.
-
-```
-Hi All,
-
-This is a call for vote to release Flink Connectors v1.0.0 for Apache Doris(Incubating).
-
-- apache-doris-flink-connector-1.14_2.12-1.0.0-incubating
-
-The release node:
-xxxxx
-
-The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/doris/flink-connector/1.0.0/
-
-Maven 2 staging repository:
-https://repository.apache.org/content/repositories/orgapachedoris-1002/org/apache/doris/doris-flink-connector/
-
-Git tag for the release:
-https://github.com/apache/incubator-doris-flink-connector/tree/1.14_2.12-1.0.0
-
-Keys to verify the Release Candidate:
-https://downloads.apache.org/incubator/doris/KEYS
-
-Look at here for how to verify this release candidate:
-http://doris.incubator.apache.org/community/release-and-verify/release-verify.html
-
-Vote thread at dev@doris: [1]
-
-The vote will be open for at least 72 hours or until necessary number of votes are reached.
-
-Please vote accordingly:
-
-[ ] +1 approve
-[ ] +0 no opinion
-[ ] -1 disapprove with the reason
-
-[1] vote thread in dev@doris
-```
-
## Completing the release
Please refer to the [Release Completion](./release-complete.md) document to complete the release process.
diff --git a/docs/en/community/release-and-verify/release-prepare.md b/docs/en/community/release-and-verify/release-prepare.md
index 35860f08a1..51c8465779 100644
--- a/docs/en/community/release-and-verify/release-prepare.md
+++ b/docs/en/community/release-and-verify/release-prepare.md
@@ -62,20 +62,15 @@ The overall release process is as follows.
3. Prepare Release Notes
4. prepare release materials
1. Tagging
- 2. upload the content to be released to the [Apache Dev SVN repository](https://dist.apache.org/repos/dist/dev/incubator/doris)
+ 2. upload the content to be released to the [Apache Dev SVN repository](https://dist.apache.org/repos/dist/dev/doris)
3. preparation of other Convenience Binaries (e.g. upload to [Maven Staging repository](https://repository.apache.org/#stagingRepositories))
4. Community Release Polling Process
2. Initiate a VOTE in the [Doris Community Dev Mail Group](dev@doris.apache.org).
3. After the vote is approved, send a Result email in the Doris community.
- 4. If it is an Incubator Project, you also need to
- 1. initiate a VOTE in the [Incubator General Mailing Group](general@incubator.apache.org). 2.
- 2. Send a Result email to general@incubator.apache.org.
5. Complete the work
- 1. Upload the signed packages to the [Apache Release repository](https://dist.apache.org/repos/dist/release/incubator/doris) and generate the relevant links.
+ 1. Upload the signed packages to the [Apache Release repository](https://dist.apache.org/repos/dist/release/doris) and generate the relevant links.
2. Post the download links on the Doris website and github, and clean up the old packages on svn.
3. Send an Announce email to dev@doris.apache.org
- 4. If it is an Incuator Project, you also need to
- 1. Send an Announce email to general@incubator.apache.org
## Prepare signatures
@@ -88,7 +83,7 @@ If this is your first time as Release Manager, then you need to prepare the foll
### Prepare gpg key
Release manager needs to create its own signature public key before release, and upload it to the public key server, then you can use this public key to sign the package to be released.
-If your KEY already exists in [KEYS](https://downloads.apache.org/incubator/doris/KEYS), then you can skip this step.
+If your KEY already exists in [KEYS](https://downloads.apache.org/doris/KEYS), then you can skip this step.
#### Installation and configuration of the signature software GnuPG
@@ -196,6 +191,8 @@ Enter passphrase, twice, more than 8 characters.
**The secret key here must be remembered, it will be used later when signing. It will also be used for publishing other components**
+**If the `gpg --gen-key` command gets stuck for a long time, try opening another terminal and execute the `find / | xargs file` command to generate enough random characters, usually after a few minutes, the gpg command will complete. **
+
>**Notice:**
>
>If the generation is stuck when it can be generated and cannot be completed for a long time, the following solutions can be used to solve it:
@@ -280,7 +277,7 @@ https://id.apache.org
**Be careful not to delete existing content in the KEYS file, it can only be added.**
```
-svn co https://dist.apache.org/repos/dist/dev/incubator/doris/
+svn co https://dist.apache.org/repos/dist/dev/doris/
# edit doris/KEYS file
gpg --list-sigs [user-id] >> doris/KEYS
gpg --armor --export [user ID] >> doris/KEYS
@@ -290,17 +287,17 @@ svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m "UPDATE KEYS"
Note that the KEYS file should also be published to the following svn library.
```
-svn co https://dist.apache.org/repos/dist/release/incubator/doris
+svn co https://dist.apache.org/repos/dist/release/doris
# edit doris/KEYS file
svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m "UPDATE KEYS"
```
After that it will automatically sync to.
```
-https://downloads.apache.org/incubator/doris/KEYS
+https://downloads.apache.org/doris/KEYS
```
-In subsequent release poll emails, use the KEYS file here in ``https://downloads.apache.org/incubator/doris/KEYS``.
+In subsequent release poll emails, use the KEYS file here in ``https://downloads.apache.org/doris/KEYS``.
## Maven Release Preparation
diff --git a/docs/zh-CN/community/release-and-verify/release-complete.md b/docs/zh-CN/community/release-and-verify/release-complete.md
index 88f449b7c3..3da4a3088d 100644
--- a/docs/zh-CN/community/release-and-verify/release-complete.md
+++ b/docs/zh-CN/community/release-and-verify/release-complete.md
@@ -26,29 +26,29 @@ under the License.
# 完成发布
-本文档中的步骤，是在完成 dev@doris 或 general@incubator 邮件组中的发版投票并通过后，进行的后续步骤。
+本文档中的步骤，是在完成 dev@doris 邮件组中的发版投票并通过后，进行的后续步骤。
## 上传 package 到 release
当正式发布投票成功后，先发[Result]邮件，然后就准备 release package。
-将之前在dev下发布的对应文件夹下的源码包、签名文件和hash文件拷贝到另一个目录 0.9.0-incubating，注意文件名字中不要rcxx (可以rename，但不要重新计算签名，hash可以重新计算，结果不会变)
+将之前在dev下发布的对应文件夹下的源码包、签名文件和hash文件拷贝到另一个目录 1.1.0，注意文件名字中不要rcxx (可以rename，但不要重新计算签名，hash可以重新计算，结果不会变)
```
From:
-https://dist.apache.org/repos/dist/dev/incubator/doris/
+https://dist.apache.org/repos/dist/dev/doris/
To:
-https://dist.apache.org/repos/dist/release/incubator/doris/
+https://dist.apache.org/repos/dist/release/doris/
```
第一次发布的话 KEYS 文件也需要拷贝过来。然后add到svn release 下。
```
add 成功后就可以在下面网址上看到你发布的文件
-https://dist.apache.org/repos/dist/release/incubator/doris/0.xx.0-incubating/
+https://dist.apache.org/repos/dist/release/doris/1.xx/
稍等一段时间后，能在 apache 官网看到：
-http://www.apache.org/dist/incubator/doris/0.9.0-incubating/
+http://www.apache.org/dist/doris/1.xx/
```
## 在 Doris 官网和 github 发布链接
@@ -60,34 +60,34 @@ http://www.apache.org/dist/incubator/doris/0.9.0-incubating/
下载链接：
```
-http://www.apache.org/dyn/closer.cgi?filename=incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz&action=download
+http://www.apache.org/dyn/closer.cgi?filename=doris/1.xx/apache-doris-1.xx-src.tar.gz&action=download
-wget --trust-server-names "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz"
+wget --trust-server-names "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=doris/1.xx/apache-doris-1.xx-src.tar.gz"
```
原始位置:
```
-https://www.apache.org/dist/incubator/doris/0.9.0-incubating/
+https://www.apache.org/dist/doris/1.xx/
-http://www.apache.org/dyn/closer.cgi/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz
+http://www.apache.org/dyn/closer.cgi/doris/1.xx/apache-doris-1.xx-src.tar.gz
```
源码包：
```
-http://www.apache.org/dyn/closer.cgi/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz
+http://www.apache.org/dyn/closer.cgi/doris/1.xx/apache-doris-1.xx-src.tar.gz
ASC:
-http://archive.apache.org/dist/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz.asc
+http://archive.apache.org/dist/doris/1.xx/apache-doris-1.xx-src.tar.gz.asc
sha512:
-http://archive.apache.org/dist/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz.sha512
+http://archive.apache.org/dist/doris/1.xx/apache-doris-1.xx-src.tar.gz.sha512
```
KEYS:
```
-http://archive.apache.org/dist/incubator/doris/KEYS
+http://archive.apache.org/dist/doris/KEYS
```
refer to: <http://www.apache.org/dev/release-download-pages#closer>
@@ -103,7 +103,7 @@ refer to: <http://www.apache.org/dev/release-download-pages#closer>
1、Github 的 release 页面
```
-https://github.com/apache/incubator-doris/releases/tag/0.9.0-rc01
+https://github.com/apache/doris/releases/tag/0.9.0-rc01
```
2、Doris 官网下载页面
@@ -124,8 +124,8 @@ docs/en/downloads/downloads.md
由于 svn 只需要保存最新版本的包，所以当有新版本发布的时候，旧版本的包就应该从 svn 上清理。
```
-https://dist.apache.org/repos/dist/release/incubator/doris/
-https://dist.apache.org/repos/dist/dev/incubator/doris/
+https://dist.apache.org/repos/dist/release/doris/
+https://dist.apache.org/repos/dist/dev/doris/
```
保持这两个地址中，只有最新版本的包即可。
@@ -133,7 +133,7 @@ https://dist.apache.org/repos/dist/dev/incubator/doris/
```
下载页面: http://doris.apache.org/downloads.html
-归档页面: http://archive.apache.org/dist/incubator/doris
+归档页面: http://archive.apache.org/dist/doris
```
Apache 会有同步机制去将历史的发布版本进行一个归档，具体操作见：[how to archive](https://www.apache.org/legal/release-policy.html#how-to-archive)
@@ -144,7 +144,7 @@ Apache 会有同步机制去将历史的发布版本进行一个归档，具体
Title:
```
-[ANNOUNCE] Apache Doris (incubating) 0.9.0 Release
+[ANNOUNCE] Apache Doris 1.xx release
```
发送邮件组：
@@ -153,47 +153,23 @@ Title:
dev@doris.apache.org
```
-孵化器项目，还需发送到：
-
-```
-general@incubator.apache.org
-```
-
邮件正文：
```
Hi All,
-We are pleased to announce the release of Apache Doris 0.9.0-incubating.
+We are pleased to announce the release of Apache Doris 1.xx.
-Apache Doris (incubating) is an MPP-based interactive SQL data warehousing for reporting and analysis.
+Apache Doris is an MPP-based interactive SQL data warehousing for reporting and analysis.
The release is available at:
http://doris.apache.org/master/zh-CN/downloads/downloads.html
Thanks to everyone who has contributed to this release, and the release note can be found here:
-https://github.com/apache/incubator-doris/releases
+https://github.com/apache/doris/releases
Best Regards,
On behalf of the Doris team,
xxx
----
-DISCLAIMER:
-Apache Doris (incubating) is an effort undergoing incubation at The
-Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted
-projects until a further review indicates that the
-infrastructure, communications, and decision making process have
-stabilized in a manner consistent with other successful ASF
-projects.
-
-While incubation status is not necessarily a reflection
-of the completeness or stability of the code, it does indicate
-that the project has yet to be fully endorsed by the ASF.
-```
-
-
-
diff --git a/docs/zh-CN/community/release-and-verify/release-doris-connectors.md b/docs/zh-CN/community/release-and-verify/release-doris-connectors.md
index 2676b2215c..32069f8720 100644
--- a/docs/zh-CN/community/release-and-verify/release-doris-connectors.md
+++ b/docs/zh-CN/community/release-and-verify/release-doris-connectors.md
@@ -33,8 +33,8 @@ Doris Connectors 目前包含：
其代码库独立于 Doris 主代码库，分别位于：
-- https://github.com/apache/incubator-doris-flink-connector
-- https://github.com/apache/incubator-doris-spark-connector
+- https://github.com/apache/doris-flink-connector
+- https://github.com/apache/doris-spark-connector
## 准备发布
@@ -100,7 +100,7 @@ mvn release:prepare -DpushChanges=false
`git push upstream --tags`
-其中 upstream 指向 `apache/incubator-doris-flink-connector` 代码库。
+其中 upstream 指向 `apache/doris-flink-connector` 代码库。
最后，执行 perform:
@@ -123,26 +123,26 @@ mvn release:perform
检出 svn 仓库：
```
-svn co https://dist.apache.org/repos/dist/dev/incubator/doris/
+svn co https://dist.apache.org/repos/dist/dev/doris/
```
打包 tag 源码，并生成签名文件和sha256校验文件。这里我们以 `1.14_2.12-1.0.0` 为例。其他 tag 操作相同
```
-git archive --format=tar 1.14_2.12-1.0.0 --prefix=apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src/ | gzip > apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz
-gpg -u xxx@apache.org --armor --output apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.asc --detach-sign apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz
-sha512sum apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz > apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.sha512
+git archive --format=tar 1.14_2.12-1.0.0 --prefix=apache-doris-flink-connector-1.14_2.12-1.0.0-src/ | gzip > apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz
+gpg -u xxx@apache.org --armor --output apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.asc --detach-sign apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz
+sha512sum apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz > apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.sha512
Mac:
-shasum -a 512 apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz > apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.sha512
+shasum -a 512 apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz > apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.sha512
```
最终得到三个文件：
```
-apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz
-apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.asc
-apache-doris-flink-connector-1.14_2.12-1.0.0-incubating-src.tar.gz.sha512
+apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz
+apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.asc
+apache-doris-flink-connector-1.14_2.12-1.0.0-src.tar.gz.sha512
```
将这三个文件移动到 svn 目录下：
@@ -178,27 +178,27 @@ doris/flink-connector/1.0.0/
```
Hi All,
-This is a call for vote to release Flink Connectors v1.0.0 for Apache Doris(Incubating).
+This is a call for vote to release Flink Connectors v1.0.0 for Apache Doris.
-- apache-doris-flink-connector-1.14_2.12-1.0.0-incubating
+- apache-doris-flink-connector-1.14_2.12-1.0.0
The release node:
xxxxx
The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/doris/flink-connector/1.0.0/
+https://dist.apache.org/repos/dist/dev/doris/flink-connector/1.0.0/
Maven 2 staging repository:
https://repository.apache.org/content/repositories/orgapachedoris-1002/org/apache/doris/doris-flink-connector/
Git tag for the release:
-https://github.com/apache/incubator-doris-flink-connector/tree/1.14_2.12-1.0.0
+https://github.com/apache/doris-flink-connector/tree/1.14_2.12-1.0.0
Keys to verify the Release Candidate:
-https://downloads.apache.org/incubator/doris/KEYS
+https://downloads.apache.org/doris/KEYS
Look at here for how to verify this release candidate:
-http://doris.incubator.apache.org/community/release-and-verify/release-verify.html
+http://doris.apache.org/community/release-and-verify/release-verify.html
The vote will be open for at least 72 hours or until necessary number of votes are reached.
@@ -209,46 +209,6 @@ Please vote accordingly:
[ ] -1 disapprove with the reason
```
-dev 邮件组通过后，再发送邮件到 general@incubator 邮件组进行 IPMC 投票。
-
-```
-Hi All,
-
-This is a call for vote to release Flink Connectors v1.0.0 for Apache Doris(Incubating).
-
-- apache-doris-flink-connector-1.14_2.12-1.0.0-incubating
-
-The release node:
-xxxxx
-
-The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/doris/flink-connector/1.0.0/
-
-Maven 2 staging repository:
-https://repository.apache.org/content/repositories/orgapachedoris-1002/org/apache/doris/doris-flink-connector/
-
-Git tag for the release:
-https://github.com/apache/incubator-doris-flink-connector/tree/1.14_2.12-1.0.0
-
-Keys to verify the Release Candidate:
-https://downloads.apache.org/incubator/doris/KEYS
-
-Look at here for how to verify this release candidate:
-http://doris.incubator.apache.org/community/release-and-verify/release-verify.html
-
-Vote thread at dev@doris: [1]
-
-The vote will be open for at least 72 hours or until necessary number of votes are reached.
-
-Please vote accordingly:
-
-[ ] +1 approve
-[ ] +0 no opinion
-[ ] -1 disapprove with the reason
-
-[1] vote thread in dev@doris
-```
-
## 完成发布
请参阅 [完成发布](./release-complete.md) 文档完成所有发布流程。
diff --git a/docs/zh-CN/community/release-and-verify/release-prepare.md b/docs/zh-CN/community/release-and-verify/release-prepare.md
index 87cda00cdc..d2c85b5875 100644
--- a/docs/zh-CN/community/release-and-verify/release-prepare.md
+++ b/docs/zh-CN/community/release-and-verify/release-prepare.md
@@ -62,20 +62,15 @@ Apache 项目的版本发布主要有以下三种形式：
3. 准备 Release Notes
4. 准备发布材料
1. 打 Tag
- 2. 将需要发布的内容上传至 [Apache Dev SVN 仓库](https://dist.apache.org/repos/dist/dev/incubator/doris)
+ 2. 将需要发布的内容上传至 [Apache Dev SVN 仓库](https://dist.apache.org/repos/dist/dev/doris)
3. 其他 Convenience Binaries 的准备（如上传到 [Maven Staging 仓库](https://repository.apache.org/#stagingRepositories)）
4. 社区发布投票流程
2. 在 Doris 社区 Dev 邮件组(**dev@doris.apache.org**)发起投票。
3. 投票通过后，在 Doris 社区发 Result 邮件。
- 4. 如果是孵化项目（Incuator Project）还需：
- 1. 在 Incubator General 邮件组(**general@incubator.apache.org**) 发起投票。
- 2. 发 Result 邮件到 general@incubator.apache.org。
5. 完成工作
- 1. 上传签名的软件包到 [Apache Release 仓库](https://dist.apache.org/repos/dist/release/incubator/doris)，并生成相关链接。
+ 1. 上传签名的软件包到 [Apache Release 仓库](https://dist.apache.org/repos/dist/release/doris/)，并生成相关链接。
2. 在 Doris 官网和 github 发布下载链接，并且清理 svn 上的旧版本包。
3. 发送 Announce 邮件到 dev@doris.apache.org
- 4. 如果是孵化项目（Incuator Project）还需：
- 1. 发送 Announce 邮件到 general@incubator.apache.org
## 准备签名
@@ -195,6 +190,8 @@ Email address 为 apache 的邮箱。
**这里的秘钥一定要记住，后面签名的时候会用到。同时也会用于其他组件的发布**
+**如果 `gpg --gen-key` 命令卡住很久，可以尝试打开另一终端后，执行 `find / | xargs file` 命令来产生足够多的随机字符，通常在几分钟后，gpg命令就会完成。**
+
>**注意：**
>
>如果在生成可以的时候出现卡住，长时间不能完成的时候，可以通过下面的方案解决：
@@ -279,7 +276,7 @@ https://id.apache.org
**注意不要删除 KEYS 文件中已有的内容，这能追加新增**
```
-svn co https://dist.apache.org/repos/dist/dev/incubator/doris/
+svn co https://dist.apache.org/repos/dist/dev/doris/
# edit doris/KEYS file
gpg --list-sigs [用户 ID] >> doris/KEYS
gpg --armor --export [用户 ID] >> doris/KEYS
@@ -289,17 +286,17 @@ svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m"Update KEYS"
注意，KEYS 文件要同时发布到如下 svn 库。
```
-svn co https://dist.apache.org/repos/dist/release/incubator/doris
+svn co https://dist.apache.org/repos/dist/release/doris
# edit doris/KEYS file
svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m"Update KEYS"
```
之后会自动同步到：
```
-https://downloads.apache.org/incubator/doris/KEYS
+https://downloads.apache.org/doris/KEYS
```
-在后续的发版投票邮件中，要使用 `https://downloads.apache.org/incubator/doris/KEYS` 这里的 KEYS 文件。
+在后续的发版投票邮件中，要使用 `https://downloads.apache.org/doris/KEYS` 这里的 KEYS 文件。
## Maven 发版准备
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org