Remove incubator in svn and download path (#2079)

* Remove incubator in svn and download path
apache · Jan 10, 2023 · 98d239e · 98d239e
1 parent 6b56355
commit 98d239e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -37,6 +37,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         libsnappy-dev && \
         apt-get clean -y
 
-RUN git clone https://github.com/apache/incubator-brpc.git
-RUN cd incubator-brpc && sh config_brpc.sh --headers=/usr/include --libs=/usr/lib && \
+RUN git clone https://github.com/apache/brpc.git
+RUN cd brpc && sh config_brpc.sh --headers=/usr/include --libs=/usr/lib && \
     make -j "$(nproc)"
diff --git a/community/apache-package-validator.sh b/community/apache-package-validator.sh
@@ -21,7 +21,7 @@
 set -e
 
 g_package_link=${1}
-g_package_keys=${2:-https://downloads.apache.org/incubator/brpc/KEYS}
+g_package_keys=${2:-https://downloads.apache.org/brpc/KEYS}
 
 g_valid_package_link=' '
 g_valid_package_name=' '

diff --git a/community/release_cn.md b/community/release_cn.md
@@ -208,7 +208,7 @@ mkdir -p ~/brpc_svn/dev/
 
 cd ~/brpc_svn/dev/
 
-svn --username=lorinlee co https://dist.apache.org/repos/dist/dev/incubator/brpc/
+svn --username=lorinlee co https://dist.apache.org/repos/dist/dev/brpc/
 
 cd ~/brpc_svn/dev/brpc
 ```
@@ -259,7 +259,7 @@ sha512sum --check apache-brpc-1.0.0-incubating-src.tar.gz.sha512
 首先导入发布人公钥。从svn仓库导入KEYS到本地环境。（发布版本的人不需要再导入，帮助做验证的人需要导入，用户名填发版人的即可）
 
 ```bash
-curl https://dist.apache.org/repos/dist/dev/incubator/brpc/KEYS >> KEYS
+curl https://dist.apache.org/repos/dist/dev/brpc/KEYS >> KEYS
 
 gpg --import KEYS
 ```
@@ -357,7 +357,7 @@ This is a call for vote to release Apache brpc (Incubating) version
 - xxx
 
 The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0/
+https://dist.apache.org/repos/dist/dev/brpc/1.0.0/
 
 Git tag for the release:
 https://github.com/apache/brpc/releases/tag/1.0.0
@@ -366,7 +366,7 @@ Release Commit ID:
 https://github.com/apache/brpc/commit/xxx
 
 Keys to verify the Release Candidate:
-https://dist.apache.org/repos/dist/dev/incubator/brpc/KEYS
+https://dist.apache.org/repos/dist/dev/brpc/KEYS
 
 The vote will be open for at least 72 hours or until the necessary number of
 votes are reached.
@@ -433,12 +433,12 @@ LorinLee
 ## 1. 更新GPG签名
 
 ```
-svn delete https://dist.apache.org/repos/dist/release/incubator/brpc/KEYS -m "delete KEYS"
+svn delete https://dist.apache.org/repos/dist/release/brpc/KEYS -m "delete KEYS"
 
-svn cp https://dist.apache.org/repos/dist/dev/incubator/brpc/KEYS https://dist.apache.org/repos/dist/release/incubator/brpc/KEYS -m "update brpc KEYS"
+svn cp https://dist.apache.org/repos/dist/dev/brpc/KEYS https://dist.apache.org/repos/dist/release/brpc/KEYS -m "update brpc KEYS"
 ```
 
-提交完svn后，访问 <https://downloads.apache.org/incubator/brpc/KEYS>，检查内容有没有更新，可能需要等几分钟时间，等内容更新了，再继续下一步。
+提交完svn后，访问 <https://downloads.apache.org/brpc/KEYS>，检查内容有没有更新，可能需要等几分钟时间，等内容更新了，再继续下一步。
 
 ## 2. 投票阶段
 
@@ -476,10 +476,10 @@ brpc community vote thread: xxx
 Vote result thread: xxx
 
 The release candidate:
-https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0/
+https://dist.apache.org/repos/dist/dev/brpc/1.0.0/
 
 This release has been signed with a PGP available here:
-https://downloads.apache.org/incubator/brpc/KEYS
+https://downloads.apache.org/brpc/KEYS
 
 Git tag for the release:
 https://github.com/apache/brpc/releases/tag/1.0.0
@@ -544,7 +544,7 @@ Apache brpc (Incubating) community
 ## 1. 将发布包从Apache SVN仓库 dist/dev 移动至 dist/release
 
 ```
-svn mv https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0 https://dist.apache.org/repos/dist/release/incubator/brpc/1.0.0 -m "release brpc 1.0.0"
+svn mv https://dist.apache.org/repos/dist/dev/brpc/1.0.0 https://dist.apache.org/repos/dist/release/brpc/1.0.0 -m "release brpc 1.0.0"
 ```
 
 ## 2. Github版本发布
@@ -556,9 +556,9 @@ svn mv https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0 https://dist.
 
 等待并确认新的发布版本同步至 Apache 镜像后，更新如下页面：<https://brpc.apache.org/docs/downloadbrpc/>, 更新方式在 <https://github.com/apache/brpc-website/> 仓库中，注意中英文都要更新。
 
-GPG签名文件和哈希校验文件的下载链接应该使用这个前缀：https://downloads.apache.org/incubator/brpc/
+GPG签名文件和哈希校验文件的下载链接应该使用这个前缀：https://downloads.apache.org/brpc/
 
-代码包的下载链接应该使用这个前缀：https://dlcdn.apache.org/incubator/brpc/
+代码包的下载链接应该使用这个前缀：https://dlcdn.apache.org/brpc/
 
 ## 4. 发送邮件通知发布完成
 

diff --git a/community/release_en.md b/community/release_en.md
@@ -213,7 +213,7 @@ mkdir -p ~/brpc_svn/dev/
 
 cd ~/brpc_svn/dev/
 
-svn --username=lorinlee co https://dist.apache.org/repos/dist/dev/incubator/brpc/
+svn --username=lorinlee co https://dist.apache.org/repos/dist/dev/brpc/
 
 cd ~/brpc_svn/dev/brpc
 ```
@@ -265,7 +265,7 @@ sha512sum --check apache-brpc-1.0.0-incubating-src.tar.gz.sha512
 First import the publisher's public key. Import KEYS from the svn repository to the local. (The person who releases the version does not need to import it again. The person who verify needs to import it.)
 
 ```bash
-curl https://dist.apache.org/repos/dist/dev/incubator/brpc/KEYS >> KEYS
+curl https://dist.apache.org/repos/dist/dev/brpc/KEYS >> KEYS
 
 gpg --import KEYS
 ```
@@ -367,7 +367,7 @@ This is a call for vote to release Apache brpc (Incubating) version
 - xxx
 
 The release candidates:
-https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0/
+https://dist.apache.org/repos/dist/dev/brpc/1.0.0/
 
 Git tag for the release:
 https://github.com/apache/brpc/releases/tag/1.0.0
@@ -376,7 +376,7 @@ Release Commit ID:
 https://github.com/apache/brpc/commit/xxx
 
 Keys to verify the Release Candidate:
-https://dist.apache.org/repos/dist/dev/incubator/brpc/KEYS
+https://dist.apache.org/repos/dist/dev/brpc/KEYS
 
 The vote will be open for at least 72 hours or until the necessary number of
 votes are reached.
@@ -443,12 +443,12 @@ If the community vote is not passed, please modify the code of the release branc
 ## 1. Update GPG Signature
 
 ```
-svn delete https://dist.apache.org/repos/dist/release/incubator/brpc/KEYS -m "delete KEYS"
+svn delete https://dist.apache.org/repos/dist/release/brpc/KEYS -m "delete KEYS"
 
-svn cp https://dist.apache.org/repos/dist/dev/incubator/brpc/KEYS https://dist.apache.org/repos/dist/release/incubator/brpc/KEYS -m "update brpc KEYS"
+svn cp https://dist.apache.org/repos/dist/dev/brpc/KEYS https://dist.apache.org/repos/dist/release/brpc/KEYS -m "update brpc KEYS"
 ```
 
-After commit the svn, access <https://downloads.apache.org/incubator/brpc/KEYS>, check whether the content is updated. It may take several minutes to wait for the content to be updated before continuing.
+After commit the svn, access <https://downloads.apache.org/brpc/KEYS>, check whether the content is updated. It may take several minutes to wait for the content to be updated before continuing.
 
 ## 2. Vote stage
 
@@ -486,10 +486,10 @@ brpc community vote thread: xxx
 Vote result thread: xxx
 
 The release candidate:
-https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0/
+https://dist.apache.org/repos/dist/dev/brpc/1.0.0/
 
 This release has been signed with a PGP available here:
-https://downloads.apache.org/incubator/brpc/KEYS
+https://downloads.apache.org/brpc/KEYS
 
 Git tag for the release:
 https://github.com/apache/brpc/releases/tag/1.0.0
@@ -554,7 +554,7 @@ Apache brpc (Incubating) community
 ## 1. Move the release package from Apache SVN directory dist/dev to dist/release
 
 ```
-svn mv https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0 https://dist.apache.org/repos/dist/release/incubator/brpc/1.0.0 -m "release brpc 1.0.0"
+svn mv https://dist.apache.org/repos/dist/dev/brpc/1.0.0 https://dist.apache.org/repos/dist/release/brpc/1.0.0 -m "release brpc 1.0.0"
 ```
 
 ## 2. Create github release
@@ -566,9 +566,9 @@ svn mv https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0 https://dist.
 
 After waiting and confirming that the new release is synchronized to the Apache image, update the following page: <https://brpc.apache.org/docs/downloadbrpc/> by change the code in <https://github.com/apache/brpc-website/>. Please update both Chinese and English.
 
-The download links of GPG signature files and hash check files should use this prefix: `https://downloads.apache.org/incubator/brpc/`
+The download links of GPG signature files and hash check files should use this prefix: `https://downloads.apache.org/brpc/`
 
-The download link of the code package should use this prefix: `https://dlcdn.apache.org/incubator/brpc/`
+The download link of the code package should use this prefix: `https://dlcdn.apache.org/brpc/`
 
 ## 4. Send email to announce release finished