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/06/30 10:03:22 UTC
[doris] 07/13: [hotfix](dev-1.0.1) remove incubating
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 40a5673d4c62e1e34dce1bfb84d6ed3078efd161
Author: morningman <mo...@163.com>
AuthorDate: Wed Jun 29 12:26:00 2022 +0800
[hotfix](dev-1.0.1) remove incubating
---
CONTRIBUTING.md | 20 ++++++++++----------
CONTRIBUTING_CN.md | 20 ++++++++++----------
DISCLAIMER | 12 ------------
NOTICE.txt | 2 +-
README.md | 20 ++++++++++----------
build.sh | 2 +-
fe/pom.xml | 10 +++++-----
fs_brokers/apache_hdfs_broker/pom.xml | 10 +++++-----
8 files changed, 42 insertions(+), 54 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 669c2d2f91..f8dcfe0c24 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ under the License.
Thank you very much for your interest in the Doris project. We welcome your suggestions, comments (including criticisms), comments and contributions to the Doris project.
-Your suggestions, comments and comments on Doris can be made directly through GitHub's [Issues] (https://github.com/apache/incubator-doris/issues/new/selection).
+Your suggestions, comments and comments on Doris can be made directly through GitHub's [Issues] (https://github.com/apache/doris/issues/new/selection).
There are many ways to participate in and contribute to Doris projects: code implementation, test writing, process tool improvement, document improvement, and so on. Any contribution will be welcomed and you will be added to the list of contributors. Further, with sufficient contributions, you will have the opportunity to become a Commiter of Apache with Apache mailbox and be included in the list of [Apache Commiters] (http://people.apache.org/committer-index.html).
@@ -31,7 +31,7 @@ Any questions, you can contact us to get timely answers, including dev mail list
For the first time in Doris community, you can:
-* Follow [Doris Github](https://github.com/apache/incubator-doris)
+* Follow [Doris Github](https://github.com/apache/doris)
* Subscribe to our [mailing list] (./subscribe-mail-list.md);
* Join Doris [Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
@@ -39,15 +39,15 @@ Learn the development trends of Doris project in time and give your opinions on
## Doris's code and documentation
-As you can see from [GitHub] (https://github.com/apache/incubator-doris), Apache Doris (incubating) code base mainly consists of three parts: Frontend (FE), Backend (BE) and Broker (to support file reading on external storage systems such as HDFS). Documents are mainly the wiki on Doris website and GitHub, as well as the online help manual when running Doris. Details of these components can be found in the following table:
+As you can see from [GitHub] (https://github.com/apache/doris), Apache Doris code base mainly consists of three parts: Frontend (FE), Backend (BE) and Broker (to support file reading on external storage systems such as HDFS). Documents are mainly the wiki on Doris website and GitHub, as well as the online help manual when running Doris. Details of these components can be found in the following table:
| Component Name | Component Description | Related Language|
|--------|----------------------------|----------|
-| [Frontend daemon (FE)] (https://github.com/apache/incubator-doris) | consists of a query coordinator and a metadata manager | Java|
-| [Backend daemon (BE)] (https://github.com/apache/incubator-doris) | Responsible for storing data and executing query fragments | C++|
-| [Broker] (https://github.com/apache/incubator-doris) | Read HDFS data to Doris | Java|
-| [Website](https://github.com/apache/incubator-doris-website) | Doris Website | Markdown |
-+ [Github Wiki] (https://github.com/apache/incubator-doris/wiki); Doris Github Wiki; Markdown_;
+| [Frontend daemon (FE)] (https://github.com/apache/doris) | consists of a query coordinator and a metadata manager | Java|
+| [Backend daemon (BE)] (https://github.com/apache/doris) | Responsible for storing data and executing query fragments | C++|
+| [Broker] (https://github.com/apache/doris) | Read HDFS data to Doris | Java|
+| [Website](https://github.com/apache/doris-website) | Doris Website | Markdown |
++ [Github Wiki] (https://github.com/apache/doris/wiki); Doris Github Wiki; Markdown_;
| Doris Runtime Help Document | Online Help Manual at Doris Runtime | Markdown|
## Improving documentation
@@ -58,11 +58,11 @@ Browse the document, you can deepen your understanding of Doris, can also help y
If you are interested in improving the quality of documents, whether it is revising the address of a page, correcting a link, and writing a better introductory document, we are very welcome!
-Most of our documents are written in markdown format, and you can modify and submit document changes directly through `docs/` in [GitHub] (https://github.com/apache/incubator-doris). If you submit code changes, you can refer to [Pull Request] (./pull-request.md).
+Most of our documents are written in markdown format, and you can modify and submit document changes directly through `docs/` in [GitHub] (https://github.com/apache/doris). If you submit code changes, you can refer to [Pull Request] (./pull-request.md).
## If a Bug or problem is found
-If a Bug or problem is found, you can directly raise a new Issue through GitHub's [Issues] (https://github.com/apache/incubator-doris/issues/new/select), and we will have someone deal with it regularly.
+If a Bug or problem is found, you can directly raise a new Issue through GitHub's [Issues] (https://github.com/apache/doris/issues/new/select), and we will have someone deal with it regularly.
You can also fix it yourself by reading the analysis code (of course, it's better to talk to us before that, maybe someone has fixed the same problem) and submit a [Pull Request] (./pull-request.md).
diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md
index 7de688f06e..111f10823f 100644
--- a/CONTRIBUTING_CN.md
+++ b/CONTRIBUTING_CN.md
@@ -21,7 +21,7 @@ under the License.
非常感谢您对 Doris 项目感兴趣，我们非常欢迎您对 Doris 项目的各种建议、意见（包括批评）、评论和贡献。
-您对 Doris 的各种建议、意见、评论可以直接通过 GitHub 的 [Issues](https://github.com/apache/incubator-doris/issues/new/choose) 提出。
+您对 Doris 的各种建议、意见、评论可以直接通过 GitHub 的 [Issues](https://github.com/apache/doris/issues/new/choose) 提出。
参与 Doris 项目并为其作出贡献的方法有很多：代码实现、测试编写、流程工具改进、文档完善等等。任何贡献我们都会非常欢迎，并将您加入贡献者列表，进一步，有了足够的贡献后，您还可以有机会成为 Apache 的 Commiter，拥有 Apache 邮箱，并被收录到 [Apache Commiter 列表中](http://people.apache.org/committer-index.html)。
@@ -31,7 +31,7 @@ under the License.
初次来到 Doris 社区，您可以：
-* 关注 Doris [Github 代码库](https://github.com/apache/incubator-doris)
+* 关注 Doris [Github 代码库](https://github.com/apache/doris)
* 订阅我们的 [邮件列表](./subscribe-mail-list.md)；
* 加入 Doris 的 [Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
@@ -39,15 +39,15 @@ under the License.
## Doris 的代码和文档
-正如您在 [GitHub] (https://github.com/apache/incubator-doris) 上看到的，Apache Doris (incubating) 的代码库主要包括三部分：Frontend (FE), Backend (BE) 和 Broker (为了支持 HDFS 等外部存储系统上的文件读取)。文档主要是 Doris 网站和 GitHub 上的 wiki，还有运行 Doris 的时候的在线帮助手册。这些组件的详细情况参见下表：
+正如您在 [GitHub] (https://github.com/apache/doris) 上看到的，Apache Doris 的代码库主要包括三部分：Frontend (FE), Backend (BE) 和 Broker (为了支持 HDFS 等外部存储系统上的文件读取)。文档主要是 Doris 网站和 GitHub 上的 wiki，还有运行 Doris 的时候的在线帮助手册。这些组件的详细情况参见下表：
| 组件名称 | 组件描述 | 相关语言 |
|--------|----------------------------|----------|
-| [Frontend daemon (FE)](https://github.com/apache/incubator-doris)| 由“查询协调器”和“元数据管理器”组成 | Java|
-| [Backend daemon (BE)](https://github.com/apache/incubator-doris) | 负责存储数据和执行查询片段 | C++|
-| [Broker](https://github.com/apache/incubator-doris) | 读取 HDFS 数据到 Doris | Java |
-| [Website](https://github.com/apache/incubator-doris-website) | Doris 网站 | Markdown |
-| [GitHub Wiki](https://github.com/apache/incubator-doris/wiki) | Doris GitHub Wiki | Markdown |
+| [Frontend daemon (FE)](https://github.com/apache/doris)| 由“查询协调器”和“元数据管理器”组成 | Java|
+| [Backend daemon (BE)](https://github.com/apache/doris) | 负责存储数据和执行查询片段 | C++|
+| [Broker](https://github.com/apache/doris) | 读取 HDFS 数据到 Doris | Java |
+| [Website](https://github.com/apache/doris-website) | Doris 网站 | Markdown |
+| [GitHub Wiki](https://github.com/apache/doris/wiki) | Doris GitHub Wiki | Markdown |
| Doris 运行时 help 文档 | 运行 Doris 的时候的在线帮助手册 | Markdown |
## 改进文档
@@ -58,11 +58,11 @@ under the License.
如果您对改进文档的质量感兴趣，不论是修订一个页面的地址、更正一个链接、以及写一篇更优秀的入门文档，我们都非常欢迎！
-我们的文档大多数是使用 markdown 格式编写的，您可以直接通过在 [GitHub] (https://github.com/apache/incubator-doris) 中的 `docs/` 中修改并提交文档变更。如果提交代码变更，可以参阅 [Pull Request](./pull-request.md)。
+我们的文档大多数是使用 markdown 格式编写的，您可以直接通过在 [GitHub] (https://github.com/apache/doris) 中的 `docs/` 中修改并提交文档变更。如果提交代码变更，可以参阅 [Pull Request](./pull-request.md)。
## 如果发现了一个 Bug 或问题
-如果发现了一个 Bug 或问题，您可以直接通过 GitHub 的 [Issues](https://github.com/apache/incubator-doris/issues/new/choose) 提一个新的 Issue，我们会有人定期处理。
+如果发现了一个 Bug 或问题，您可以直接通过 GitHub 的 [Issues](https://github.com/apache/doris/issues/new/choose) 提一个新的 Issue，我们会有人定期处理。
您也可以通过阅读分析代码自己修复（当然在这之前最好能和我们交流下，或许已经有人在修复同样的问题了），然后提交一个 [Pull Request](./pull-request.md)。
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index bcae8b923f..0000000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,12 +0,0 @@
-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/NOTICE.txt b/NOTICE.txt
index 7f0561b0f5..a14d712816 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,4 +1,4 @@
-Apache Doris (incubating)
+Apache Doris
Copyright 2018-2022 The Apache Software Foundation
This product includes software developed at
diff --git a/README.md b/README.md
index 53d195916c..2b1a046e2c 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
-# Apache Doris (incubating)
+# Apache Doris
[](https://www.apache.org/licenses/LICENSE-2.0.html)
-[](https://github.com/apache/incubator-doris)
-[](https://github.com/apache/incubator-doris/releases)
+[](https://github.com/apache/doris)
+[](https://github.com/apache/doris/releases)
[](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
[](https://gitter.im/apache-doris/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -33,13 +33,13 @@ Its original name was Palo, developed in Baidu. After donated to Apache Software
- Doris provides high availability, reliability, fault tolerance, and scalability.
-The main advantages of Doris are the simplicity (of developing, deploying and using) and meeting many data serving requirements in a single system. For details, refer to [Overview](https://github.com/apache/incubator-doris/wiki/Doris-Overview).
+The main advantages of Doris are the simplicity (of developing, deploying and using) and meeting many data serving requirements in a single system. For details, refer to [Overview](https://github.com/apache/doris/wiki/Doris-Overview).
**Official website: https://doris.apache.org/**
-[](https://www.apiseven.com/en/contributor-graph?chart=contributorMonthlyActivity&repo=apache/incubator-doris)
+[](https://www.apiseven.com/en/contributor-graph?chart=contributorMonthlyActivity&repo=apache/doris)
-[](https://www.apiseven.com/en/contributor-graph?chart=contributorOverTime&repo=apache/incubator-doris)
+[](https://www.apiseven.com/en/contributor-graph?chart=contributorOverTime&repo=apache/doris)
## License
@@ -55,15 +55,15 @@ Doris mainly integrates the technology of [Google Mesa](https://research.google/
## Compile and install
-See [Compilation](https://doris.incubator.apache.org/installing/compilation-with-ldb-toolchain.html)
+See [Compilation](https://doris.apache.org/installing/compilation-with-ldb-toolchain.html)
## Getting start
-See [Basic Usage](https://doris.incubator.apache.org/getting-started/basic-usage.html)
+See [Basic Usage](https://doris.apache.org/getting-started/basic-usage.html)
## Report issues or submit pull request
-If you find any bugs, feel free to file a [GitHub issue](https://github.com/apache/incubator-doris/issues) or fix it by submitting a [pull request](https://github.com/apache/incubator-doris/pulls).
+If you find any bugs, feel free to file a [GitHub issue](https://github.com/apache/doris/issues) or fix it by submitting a [pull request](https://github.com/apache/doris/pulls).
## Contact Us
@@ -75,6 +75,6 @@ Contact us through the following mailing list.
## Links
-* Doris official site - <http://doris.incubator.apache.org>
+* Doris official site - <http://doris.apache.org>
* Developer Mailing list - <de...@doris.apache.org>. Mail to <de...@doris.apache.org>, follow the reply to subscribe the mail list.
* Slack channel - [Join the Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
diff --git a/build.sh b/build.sh
index 0e537a7808..6441dab50f 100755
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@
# under the License.
##############################################################
-# This script is used to compile Apache Doris(incubating).
+# This script is used to compile Apache Doris
# Usage:
# sh build.sh --help
# Eg:
diff --git a/fe/pom.xml b/fe/pom.xml
index be3cec77ac..ec390c9c26 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -39,14 +39,14 @@ under the License.
</license>
</licenses>
<scm>
- <connection>scm:git:https://git@github.com/apache/incubator-doris.git</connection>
- <developerConnection>scm:git:https://git@github.com/apache/incubator-doris.git</developerConnection>
- <url>scm:git:https://git@github.com/apache/incubator-doris.git</url>
+ <connection>scm:git:https://git@github.com/apache/doris.git</connection>
+ <developerConnection>scm:git:https://git@github.com/apache/doris.git</developerConnection>
+ <url>scm:git:https://git@github.com/apache/doris.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/apache/incubator-doris/issues</url>
+ <url>https://github.com/apache/doris/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
@@ -196,7 +196,7 @@ under the License.
<aws-java-sdk-s3.version>1.11.95</aws-java-sdk-s3.version>
<mariadb-java-client.version>3.0.4</mariadb-java-client.version>
- <revision>0.15-SNAPSHOT</revision>
+ <revision>1.0-SNAPSHOT</revision>
<project.scm.id>github</project.scm.id>
</properties>
<profiles>
diff --git a/fs_brokers/apache_hdfs_broker/pom.xml b/fs_brokers/apache_hdfs_broker/pom.xml
index c15f5f63ba..77006b8f9e 100644
--- a/fs_brokers/apache_hdfs_broker/pom.xml
+++ b/fs_brokers/apache_hdfs_broker/pom.xml
@@ -27,7 +27,7 @@ under the License.
</parent>
<groupId>org.apache.doris</groupId>
<artifactId>apache-hdfs-broker</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Doris HDFS Broker</name>
<url>https://doris.apache.org/</url>
@@ -39,14 +39,14 @@ under the License.
</license>
</licenses>
<scm>
- <connection>scm:git:https://git@github.com/apache/incubator-doris.git</connection>
- <developerConnection>scm:git:https://git@github.com/apache/incubator-doris.git</developerConnection>
- <url>scm:git:https://git@github.com/apache/incubator-doris.git</url>
+ <connection>scm:git:https://git@github.com/apache/doris.git</connection>
+ <developerConnection>scm:git:https://git@github.com/apache/doris.git</developerConnection>
+ <url>scm:git:https://git@github.com/apache/doris.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/apache/incubator-doris/issues</url>
+ <url>https://github.com/apache/doris/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org