From 51860890fd39e8aa763d4eb24ef85d140ceaddb2 Mon Sep 17 00:00:00 2001 From: kimmking Date: Mon, 20 Apr 2020 18:34:17 +0800 Subject: [PATCH] delete incubating words (#5240) --- CODE_OF_CONDUCT.md | 2 +- DISCLAIMER | 5 - MATURITY.md | 86 ---------- NOTICE | 2 +- README.md | 21 +-- README_ZH.md | 20 +-- docs/README.md | 4 +- .../content/contribute/code-conduct.cn.md | 2 +- .../content/contribute/code-conduct.en.md | 2 +- .../content/contribute/contributor.cn.md | 6 +- .../content/contribute/contributor.en.md | 6 +- .../contribute/document-contributor.cn.md | 10 +- .../contribute/document-contributor.en.md | 10 +- .../content/contribute/release.cn.md | 151 ++++++++---------- .../content/contribute/release.en.md | 151 ++++++++---------- .../content/contribute/subscribe.cn.md | 2 +- .../content/contribute/subscribe.en.md | 2 +- .../community/content/powered-by/_index.cn.md | 2 +- .../community/content/powered-by/_index.en.md | 2 +- docs/community/content/team/_index.cn.md | 5 +- docs/community/content/team/_index.en.md | 5 +- docs/document/content/downloads/_index.cn.md | 16 +- docs/document/content/downloads/_index.en.md | 16 +- docs/document/content/faq/_index.cn.md | 2 +- docs/document/content/faq/_index.en.md | 2 +- .../content/features/spi/_index.cn.md | 2 +- .../content/features/spi/_index.en.md | 2 +- .../test-engine/performance-test.cn.md | 8 +- .../test-engine/performance-test.en.md | 10 +- .../configuration/config-java.cn.md | 2 +- .../configuration/config-java.en.md | 2 +- .../config-spring-namespace.cn.md | 2 +- .../config-spring-namespace.en.md | 2 +- .../manual/sharding-jdbc/usage/_index.cn.md | 3 +- .../manual/sharding-jdbc/usage/_index.en.md | 2 +- .../manual/sharding-jdbc/usage/hint.cn.md | 2 +- .../manual/sharding-jdbc/usage/hint.en.md | 2 +- .../sharding-jdbc/usage/transaction.cn.md | 2 +- .../sharding-jdbc/usage/transaction.en.md | 2 +- .../manual/sharding-proxy/docker.cn.md | 4 +- .../manual/sharding-proxy/docker.en.md | 4 +- .../manual/sharding-scaling/build.cn.md | 6 +- .../manual/sharding-scaling/build.en.md | 6 +- .../manual/sharding-ui/usage/build.cn.md | 4 +- .../manual/sharding-ui/usage/build.en.md | 4 +- docs/document/content/overview/_index.cn.md | 18 +-- docs/document/content/overview/_index.en.md | 19 ++- .../sharding-scaling-quick-start.cn.md | 6 +- .../sharding-scaling-quick-start.en.md | 6 +- examples/README.md | 14 +- examples/README_ZH.md | 14 +- pom.xml | 14 +- shardingsphere-ui/DISCLAIMER | 5 - shardingsphere-ui/NOTICE | 2 +- shardingsphere-ui/README.md | 6 +- shardingsphere-ui/README_ZH.md | 6 +- 56 files changed, 289 insertions(+), 424 deletions(-) delete mode 100644 DISCLAIMER delete mode 100644 MATURITY.md delete mode 100644 shardingsphere-ui/DISCLAIMER diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f4d48b7be6..c7a5e27575 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -13,7 +13,7 @@ The following code of conduct is based on full compliance with [ASF CODE OF COND - Make sure all the test cases are passed, Make sure `./mvnw clean install` can be compiled and tested successfully. - Make sure the test coverage rate is not lower than the master branch. - - Make sure to check codes with Checkstyle. codes that violate check rules should have special reasons. Find checkstyle template from `https://github.com/apache/incubator-shardingsphere/blob/master/src/resources/checkstyle.xml`, please use checkstyle `8.8` to run the rules. + - Make sure to check codes with Checkstyle. codes that violate check rules should have special reasons. Find checkstyle template from `https://github.com/apache/shardingsphere/blob/master/src/resources/checkstyle.xml`, please use checkstyle `8.8` to run the rules. - Careful consideration for each `pull request`; Small and frequent `pull request` with complete unit function is welcomed. - Conform to `Contributor Covenant Code of Conduct` below. diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index cf7b29dc7d..0000000000 --- a/DISCLAIMER +++ /dev/null @@ -1,5 +0,0 @@ -Apache ShardingSphere (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/MATURITY.md b/MATURITY.md deleted file mode 100644 index 4c01c4c475..0000000000 --- a/MATURITY.md +++ /dev/null @@ -1,86 +0,0 @@ -# Podling Maturity Assessment for ShardingSphere - -## Overview - -This is an assessment of the ShardingSphere podling’s maturity, meant to help inform the decision (of the mentors, community, Incubator PMC and ASF Board of Directors) to graduate it as a top-level Apache project. - -It is based on the ASF project maturity model at https://community.apache.org/apache-way/apache-project-maturity-model.html - -## Status of this document - -All open items are updated with the latest status. - -## Maturity model assessment - -Mentors and community members are encouraged to contribute to this page and comment on it, the following table summarizes project’s self-assessment against the Apache Maturity Model. - -**CODE** - -| **ID** | **Description** | **Status** | -| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | -| **CD10** | The project produces Open Source software, for distribution to the public at no charge. | **YES.** The project source code is licensed under the `Apache License 2.0`. | -| **CD20** | The project's code is easily discoverable and publicly accessible. | **YES.** The [website](https://shardingsphere.apache.org/) includes `SCM` link which can access GitHub directly. | -| **CD30** | The code can be built in a reproducible way using widely available standard tools. | **YES.** The build uses Apache Maven and Jenkins as the continuous integration tools, user can find `How to Build` in the [GitHub's README.md](https://github.com/apache/incubator-shardingsphere/blob/dev/README.md) for more information. | -| **CD40** | The full history of the project's code is available via a source code control system, in a way that allows any released version to be recreated. | **YES.** The project uses git to manage source code, demo code, documentation and website, all releases are tagged. | -| **CD50** | The provenance of each line of code is established via the source code control system, in a reliable way based on strong authentication of the committer. When third-party contributions are committed, commit messages provide reliable information about the code provenance. | **YES.** The project uses GitHub which managed by Apache Infra, it ensuring provenance of each line of code to a committer. The third-party contributions are accepted in accordance with the [contributor guide](https://shardingsphere.apache.org/community/en/contribute/contributor/) only. | - -**Licenses and Copyright** - -| **ID** | **Description** | **Status** | -| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | -| **LC10** | The code is released under the Apache License, version 2.0. | **YES.** The [LICENSE file](https://github.com/apache/incubator-shardingsphere/blob/dev/LICENSE) is in GitHub repository. | -| **LC20** | Libraries that are mandatory dependencies of the project's code do not create more restrictions than the Apache License does. | **YES.** The [list of dependencies](https://github.com/apache/incubator-shardingsphere/tree/dev/sharding-distribution/sharding-proxy-distribution/src/main/release-docs/licenses) for binary release and [list of dependencies](https://github.com/terrymanu/incubator-shardingsphere/tree/parser/shardingsphere-ui/shardingsphere-ui-distribution/src/main/release-docs/licenses) of UI binary release have been reviewed to contain compatible licenses only. | -| **LC30** | The libraries mentioned in LC20 are available as Open Source software. | **YES.** See LC20's dependencies list. | -| **LC40** | Committers are bound by an Individual Contributor Agreement (the "Apache iCLA") that defines which code they are allowed to commit and how they need to identify code that is not their own. | **YES.** All committers have iCLAs on file before they have an apache account. | -| **LC50** | The copyright ownership of everything that the project produces is clearly defined and documented. | **YES.** All files in the source code have appropriate headers and checked by `Apache rat plugin` when build. | - -**Releases** - -| **ID** | **Description** | **Status** | -| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | -| **RE10** | Releases consist of source code, distributed using standard and open archive formats that are expected to stay readable in the long term. | **YES.** Source release is distributed via [dist.apache.org](https://dist.apache.org/repos/dist/release/incubator/shardingsphere/) and linked from [download page](https://shardingsphere.apache.org/document/current/en/downloads/). | -| **RE20** | Releases are approved by the project's PMC (see CS10), in order to make them an act of the Foundation. | **YES.** All releases have been voted by ShardingSphere community and incubator, which have least 3 (P)PMC votes. | -| **RE30** | Releases are signed and/or distributed along with digests that can be reliably used to validate the downloaded archives. | **YES.** All releases are signed, and the [KEYS file](https://dist.apache.org/repos/dist/release/incubator/shardingsphere/KEYS) is provided on dist.apache.org. | -| **RE40** | Convenience binaries can be distributed alongside source code but they are not Apache Releases -- they are just a convenience provided with no guarantee. | **YES.** Convenience binaries are distributed via [Maven Central Repository](https://mvnrepository.com/artifact/org.apache.shardingsphere), [DockerHub](https://hub.docker.com/r/apache/sharding-proxy/tags) and [dist.apache.org](https://dist.apache.org/repos/dist/release/incubator/shardingsphere/) at the same time. | -| **RE50** | The release process is documented and repeatable to the extent that someone new to the project is able to independently generate the complete set of artifacts required for a release. | **YES.** [Release guide](https://shardingsphere.apache.org/community/en/contribute/release/) is available. The releases of the project have been performed by 3 different release managers. | - -**Quality** - -| **ID** | **Description** | **Status** | -| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | -| **QU10** | The project is open and honest about the quality of its code. Various levels of quality and maturity for various modules are natural and acceptable as long as they are clearly communicated. | **YES.** All [issues](https://github.com/apache/incubator-shardingsphere/issues) record in ShardingSphere's GitHub repository. | -| **QU20** | The project puts a very high priority on producing secure software. | **YES.** Security issues are treated with the highest priority. | -| **QU30** | The project provides a well-documented, secure and private channel to report security issues, along with a documented way of responding to them. | **YES.** Website provides a [security page](https://shardingsphere.apache.org/community/en/security/) | -| **QU40** | The project puts a high priority on backwards compatibility and aims to document any incompatible changes and provide tools and documentation to help users transition to new features. | **YES.** Each release note contains all related issues and pull requests in the milestone, and extract mainly updates and API changes from milestones. | -| **QU50** | The project strives to respond to documented bug reports in a timely manner. | **YES.** The project has resolved 2000+ issues and 1200+ pull requests during 3 years. The response times on are pretty good. | - -**Community** - -| **ID** | **Description** | **Status** | -| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | -| **CO10** | The project has a well-known homepage that points to all the information required to operate according to this maturity model. | **YES.** The [website](https://shardingsphere.apache.org/) describes of the project with download, user manual, technical details, how to contribute and team introduce. | -| **CO20** | The community welcomes contributions from anyone who acts in good faith and in a respectful manner and adds value to the project. | **YES.** There is [contributor guide](https://shardingsphere.apache.org/community/en/contribute/contributor/) and the current committers are really welcome contributions. | -| **CO30** | Contributions include not only source code, but also documentation, constructive bug reports, constructive discussions, marketing and generally anything that adds value to the project. | **YES.** The contribution guide refers to non source code contribution, like [documentation](https://shardingsphere.apache.org/community/en/contribute/document-contributor/). The community has elected some non-coding committers. | -| **CO40** | The community strives to be meritocratic and over time aims to give more rights and responsibilities to contributors who add value to the project. | **YES.** The community has elected 2 new PPMC members and 4 new committers during incubation, based on meritocracy. | -| **CO50** | The way in which contributors can be granted more rights such as commit access or decision power is clearly documented and is the same for all contributors. | **YES.** The criteria is documented in the [committer guide](https://shardingsphere.apache.org/community/en/contribute/committer/). | -| **CO60** | The community operates based on consensus of its members (see CS10) who have decision power. Dictators, benevolent or not, are not welcome in Apache projects. | **YES.** The project works to build consensus. All votes have been unanimous so far. | -| **CO70** | The project strives to answer user questions in a timely manner. | **YES.** The project typically provides detailed answers to user questions within a few days via [dev@ mailing list](mailto:dev@shardingsphere.apache.org) and [GitHub issues](https://github.com/apache/incubator-shardingsphere/issues). | - -**Consensus** - -| **ID** | **Description** | **Status** | -| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | -| **CS10** | The project maintains a public list of its contributors who have decision power -- the project's PMC (Project Management Committee) consists of those contributors. | **YES.** The [team page](https://shardingsphere.apache.org/community/en/team/) list all of PPMC members and committers. | -| **CS20** | Decisions are made by consensus among PMC members 9 and are documented on the project's main communications channel. Community opinions are taken into account but the PMC has the final word if needed. | **YES.** The project has been making important decisions on the mailing lists. | -| **CS30** | Documented voting rules are used to build consensus when discussion is not sufficient. | **YES.** The project uses the standard ASF voting rules. | -| **CS40** | In Apache projects, vetoes are only valid for code commits and are justified by a technical explanation, as per the Apache voting rules defined in CS30. | **YES.** The project has not used a veto at any point during incubating. | -| **CS50** | All "important" discussions happen asynchronously in written form on the project's main communications channel. Offline, face-to-face or private discussions 11 that affect the project are also documented on that channel. | **YES.** The project has been making important decisions on the project mailing lists. Minor decisions may occasionally happen during code reviews, which are also asynchronous and in written form. | - -**Independence** - -| **ID** | **Description** | **Status** | -| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | -| **IN10** | The project is independent from any corporate or organizational influence. | **YES.** The project team gathers people from different companies (JD.com, dangdang.com, CHINA TELECOM Bestpay, DAOCloud). No company or organization has significantly more influence than any other. We can note a growth of the contributions coming from different committers. | -| **IN20** | Contributors act as themselves as opposed to representatives of a corporation or organization. | **YES.** The contributors act on their own initiative without representing a corporation or organization. | - -Mentors, PPMCs and committers please discuss and modify on [wiki](https://cwiki.apache.org/confluence/display/SHARDINGSPHERE/Podling+Maturity+Assessment+for+ShardingSphere). diff --git a/NOTICE b/NOTICE index f700ec4cfc..0e79da7be6 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Apache ShardingSphere (incubating) +Apache ShardingSphere Copyright 2018-2020 The Apache Software Foundation This product includes software developed at diff --git a/README.md b/README.md index 22abc02506..0fcf96b640 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@ [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Gitter](https://badges.gitter.im/shardingsphere/shardingsphere.svg)](https://gitter.im/shardingsphere/Lobby) -[![GitHub release](https://img.shields.io/github/release/apache/incubator-shardingsphere.svg)](https://github.com/apache/incubator-shardingsphere/releases) -[![Stargazers over time](https://starchart.cc/apache/incubator-shardingsphere.svg)](https://starchart.cc/apache/incubator-shardingsphere) +[![GitHub release](https://img.shields.io/github/release/apache/shardingsphere.svg)](https://github.com/apache/shardingsphere/releases) +[![Stargazers over time](https://starchart.cc/apache/shardingsphere.svg)](https://starchart.cc/apache/shardingsphere) -[![Total Lines](https://tokei.rs/b1/github/apache/incubator-shardingsphere?category=lines)](https://github.com/apache/incubator-shardingsphere) +[![Total Lines](https://tokei.rs/b1/github/apache/shardingsphere?category=lines)](https://github.com/apache/shardingsphere) [![Build Status](https://builds.apache.org/job/shardingsphere-ci-dev/badge/icon)](https://builds.apache.org/job/shardingsphere-ci-dev/) -[![Coverage Status](https://coveralls.io/repos/github/apache/incubator-shardingsphere/badge.svg?branch=master)](https://coveralls.io/github/apache/incubator-shardingsphere?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/apache/shardingsphere/badge.svg?branch=master)](https://coveralls.io/github/apache/shardingsphere?branch=master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/278600ed40ad48e988ab485b439abbcd)](https://www.codacy.com/app/terrymanu/sharding-sphere?utm_source=github.com&utm_medium=referral&utm_content=sharding-sphere/sharding-sphere&utm_campaign=Badge_Grade) -[![snyk](https://snyk.io/test/github/apache/incubator-shardingsphere/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/apache/incubator-shardingsphere?targetFile=pom.xml) +[![snyk](https://snyk.io/test/github/apache/shardingsphere/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/apache/shardingsphere?targetFile=pom.xml) [![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) [![Skywalking Tracing](https://img.shields.io/badge/Skywalking%20Tracing-enable-brightgreen.svg)](https://github.com/apache/skywalking) @@ -29,6 +29,9 @@ Aiming at reasonably making full use of the computation and storage capacity of As the cornerstone of many enterprises, relational database still takes a huge market share. Therefore, at the current stage, we prefer to focus on its increment instead of a total overturn. +ShardingSphere had graduated from [Apache Incubator](http://incubator.apache.org/projects/shardingsphere.html) on April 16 2020, is now officially an Apache Project! +Welcome discuss with community via [shardingsphere dev mail list](mailto:dev@shardingsphere.apache.org). + __Apache releases are beginning from version 4.0.0__ ![ShardingSphere Scope](https://shardingsphere.apache.org//document/current/img/shardingsphere-scope_en.png) @@ -130,9 +133,9 @@ Architects can adjust the system architecture to the most applicable one to curr Artifact: ``` -sharding-distribution/sharding-jdbc-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-jdbc-bin.tar.gz: Binary package of Sharding-JDBC -sharding-distribution/sharding-proxy-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-proxy-bin.tar.gz: Binary package of Sharding-Proxy -sharding-distribution/shardingsphere-src-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-src.zip: Source code package of ShardingSphere +sharding-distribution/sharding-jdbc-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-jdbc-bin.tar.gz: Binary package of Sharding-JDBC +sharding-distribution/sharding-proxy-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-proxy-bin.tar.gz: Binary package of Sharding-Proxy +sharding-distribution/shardingsphere-src-distribution/target/apache-shardingsphere-${latest.release.version}-src.zip: Source code package of ShardingSphere ``` ### Build ShardingSphere-UI @@ -145,7 +148,7 @@ cd shardingsphere-ui Artifact: ``` -shardingsphere-ui/shardingsphere-ui-distribution/shardingsphere-ui-bin-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-shardingsphere-ui-bin.tar.gz: Binary package of ShardingSphere-UI +shardingsphere-ui/shardingsphere-ui-distribution/shardingsphere-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-ui-bin.tar.gz: Binary package of ShardingSphere-UI ``` ## Landscapes diff --git a/README_ZH.md b/README_ZH.md index c658851d19..5d8a417630 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -4,14 +4,14 @@ [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Gitter](https://badges.gitter.im/shardingsphere/shardingsphere.svg)](https://gitter.im/shardingsphere/Lobby) -[![GitHub release](https://img.shields.io/github/release/apache/incubator-shardingsphere.svg)](https://github.com/apache/incubator-shardingsphere/releases) -[![Stargazers over time](https://starchart.cc/apache/incubator-shardingsphere.svg)](https://starchart.cc/apache/incubator-shardingsphere) +[![GitHub release](https://img.shields.io/github/release/apache/shardingsphere.svg)](https://github.com/apache/shardingsphere/releases) +[![Stargazers over time](https://starchart.cc/apache/shardingsphere.svg)](https://starchart.cc/apache/shardingsphere) -[![Total Lines](https://tokei.rs/b1/github/apache/incubator-shardingsphere?category=lines)](https://github.com/apache/incubator-shardingsphere) +[![Total Lines](https://tokei.rs/b1/github/apache/shardingsphere?category=lines)](https://github.com/apache/shardingsphere) [![Build Status](https://builds.apache.org/job/shardingsphere-ci-dev/badge/icon)](https://builds.apache.org/job/shardingsphere-ci-dev/) -[![Coverage Status](https://coveralls.io/repos/github/apache/incubator-shardingsphere/badge.svg?branch=master)](https://coveralls.io/github/apache/incubator-shardingsphere?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/apache/shardingsphere/badge.svg?branch=master)](https://coveralls.io/github/apache/shardingsphere?branch=master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/278600ed40ad48e988ab485b439abbcd)](https://www.codacy.com/app/terrymanu/sharding-sphere?utm_source=github.com&utm_medium=referral&utm_content=sharding-sphere/sharding-sphere&utm_campaign=Badge_Grade) -[![snyk](https://snyk.io/test/github/apache/incubator-shardingsphere/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/apache/incubator-shardingsphere?targetFile=pom.xml) +[![snyk](https://snyk.io/test/github/apache/shardingsphere/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/apache/shardingsphere?targetFile=pom.xml) [![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) [![Skywalking Tracing](https://img.shields.io/badge/Skywalking%20Tracing-enable-brightgreen.svg)](https://github.com/apache/skywalking) @@ -28,7 +28,7 @@ ShardingSphere定位为关系型数据库中间件，旨在充分合理地在分 它与NoSQL和NewSQL是并存而非互斥的关系。NoSQL和NewSQL作为新技术探索的前沿，放眼未来，拥抱变化，是非常值得推荐的。反之，也可以用另一种思路看待问题，放眼未来，关注不变的东西，进而抓住事物本质。 关系型数据库当今依然占有巨大市场，是各个公司核心业务的基石，未来也难于撼动，我们目前阶段更加关注在原有基础上的增量，而非颠覆。 -ShardingSphere目前已经进入[Apache孵化器](http://incubator.apache.org/projects/shardingsphere.html)， +ShardingSphere已经在2020年4月16日从[Apache孵化器](http://incubator.apache.org/projects/shardingsphere.html)毕业，成为Apache顶级项目。 欢迎通过[shardingsphere的dev邮件列表](mailto:dev@shardingsphere.apache.org)与我们讨论。 __Apache官方发布从4.0.0版本开始。__ @@ -127,9 +127,9 @@ ShardingSphere是多接入端共同组成的生态圈。 构建产物： ``` -sharding-distribution/sharding-jdbc-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-jdbc-bin.tar.gz: Sharding-JDBC的二进制包 -sharding-distribution/sharding-proxy-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-proxy-bin.tar.gz: Sharding-Proxy的二进制包 -sharding-distribution/shardingsphere-src-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-src.zip: ShardingSphere的源码包 +sharding-distribution/sharding-jdbc-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-jdbc-bin.tar.gz: Sharding-JDBC的二进制包 +sharding-distribution/sharding-proxy-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-proxy-bin.tar.gz: Sharding-Proxy的二进制包 +sharding-distribution/shardingsphere-src-distribution/target/apache-shardingsphere-${latest.release.version}-src.zip: ShardingSphere的源码包 ``` ### 构建ShardingSphere UI @@ -142,7 +142,7 @@ cd shardingsphere-ui 构建产物： ``` -shardingsphere-ui/shardingsphere-ui-distribution/shardingsphere-ui-bin-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-shardingsphere-ui-bin.tar.gz: ShardingSphere-UI的二进制包 +shardingsphere-ui/shardingsphere-ui-distribution/shardingsphere-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-ui-bin.tar.gz: ShardingSphere-UI的二进制包 ``` ## 全景图 diff --git a/docs/README.md b/docs/README.md index d481c49dc9..e815ffbac9 100644 --- a/docs/README.md +++ b/docs/README.md @@ -5,7 +5,7 @@ To build ShardingSphere website by means of [hugo](http://gohugo.io/overview/int Follow the steps below to deploy ShardingSphere website, 1. Execute `docs/build.sh` to generate `html` files at the directory of `docs/target/`. -2. Clone [incubator-shardingsphere-doc](https://github.com/apache/incubator-shardingsphere-doc.git). +2. Clone [shardingsphere-doc](https://github.com/apache/shardingsphere-doc.git). 3. Checkout to `asf-site` branch. 3. Overwrite `document/current` with `docs/target/document/current` and `community` with `docs/target/community`. -4. Commit changes and raise a PR for [incubator-shardingsphere-doc](https://github.com/apache/incubator-shardingsphere-doc.git). +4. Commit changes and raise a PR for [shardingsphere-doc](https://github.com/apache/shardingsphere-doc.git). diff --git a/docs/community/content/contribute/code-conduct.cn.md b/docs/community/content/contribute/code-conduct.cn.md index 68a82b624d..cd73a9637e 100644 --- a/docs/community/content/contribute/code-conduct.cn.md +++ b/docs/community/content/contribute/code-conduct.cn.md @@ -20,7 +20,7 @@ chapter = true - 确保通过全部测试用例，确保执行`./mvnw clean install`可以编译和测试通过。 - 确保覆盖率不低于master分支。 - - 确保使用Checkstyle检查代码，违反验证规则的需要有特殊理由。模板位置在`https://github.com/apache/incubator-shardingsphere/blob/master/src/resources/checkstyle.xml`，请使用checkstyle 8.8运行规则。 + - 确保使用Checkstyle检查代码，违反验证规则的需要有特殊理由。模板位置在`https://github.com/apache/shardingsphere/blob/master/src/resources/checkstyle.xml`，请使用checkstyle 8.8运行规则。 - 应尽量将设计精细化拆分；做到小幅度修改，多次数提交，但应保证提交的完整性。 - 确保遵守编码规范。 diff --git a/docs/community/content/contribute/code-conduct.en.md b/docs/community/content/contribute/code-conduct.en.md index 414271775e..a84316ad15 100644 --- a/docs/community/content/contribute/code-conduct.en.md +++ b/docs/community/content/contribute/code-conduct.en.md @@ -17,7 +17,7 @@ The following code of conduct is based on full compliance with [ASF CODE OF COND - Make sure all the test cases are passed, Make sure `./mvnw clean install` can be compiled and tested successfully. - Make sure the test coverage rate is not lower than the master branch. - - Make sure to check codes with Checkstyle. codes that violate check rules should have special reasons. Find checkstyle template from `https://github.com/apache/incubator-shardingsphere/blob/master/src/resources/checkstyle.xml`, please use checkstyle `8.8` to run the rules. + - Make sure to check codes with Checkstyle. codes that violate check rules should have special reasons. Find checkstyle template from `https://github.com/apache/shardingsphere/blob/master/src/resources/checkstyle.xml`, please use checkstyle `8.8` to run the rules. - Careful consideration for each `pull request`; Small and frequent `pull request` with complete unit function is welcomed. - Conform to `Contributor Covenant Code of Conduct` below. diff --git a/docs/community/content/contribute/contributor.cn.md b/docs/community/content/contribute/contributor.cn.md index 21954a99f2..b70d4a2136 100644 --- a/docs/community/content/contribute/contributor.cn.md +++ b/docs/community/content/contribute/contributor.cn.md @@ -9,8 +9,8 @@ chapter = true ## 提交issue - 在提交issue之前，请经过充分的搜索，确定该issue不是通过简单的检索即可以解决的问题。 - - 查看[issue列表](https://github.com/apache/incubator-shardingsphere/issues)，确定该issue不是一个重复的问题。 - - [新建](https://github.com/apache/incubator-shardingsphere/issues/new/choose)一个issue并选择您的issue类型。 + - 查看[issue列表](https://github.com/apache/shardingsphere/issues)，确定该issue不是一个重复的问题。 + - [新建](https://github.com/apache/shardingsphere/issues/new/choose)一个issue并选择您的issue类型。 - 使用一个清晰并有描述性的标题来定义issue。 - 根据模板填写必要信息。 - 在提交issue之后，对该issue分配合适的标签。如：bug，enhancement，discussion等。 @@ -23,7 +23,7 @@ chapter = true - 从shardingsphere的repo上fork一个分支到您自己的repo来开始工作，并设置upstream为shardingsphere的repo。 ```shell -git remote add upstream https://github.com/apache/incubator-shardingsphere.git +git remote add upstream https://github.com/apache/shardingsphere.git ``` ### 选择issue diff --git a/docs/community/content/contribute/contributor.en.md b/docs/community/content/contribute/contributor.en.md index f76494629d..1c59e1ddf9 100644 --- a/docs/community/content/contribute/contributor.en.md +++ b/docs/community/content/contribute/contributor.en.md @@ -9,8 +9,8 @@ You can report a bug, submit a new function enhancement suggestion, or submit a ## Submit an Issue - Before submitting an issue, please go through a comprehensive search to make sure the problem cannot be solved just by searching. - - Check the [Issue List](https://github.com/apache/incubator-shardingsphere/issues) to make sure the problem is not repeated. - - [Create](https://github.com/apache/incubator-shardingsphere/issues/new/choose) a new issue and choose the type of issue. + - Check the [Issue List](https://github.com/apache/shardingsphere/issues) to make sure the problem is not repeated. + - [Create](https://github.com/apache/shardingsphere/issues/new/choose) a new issue and choose the type of issue. - Define the issue with a clear and descriptive title. - Fill in necessary information according to the template. - Choose a label after issue created, for example: bug，enhancement，discussion. @@ -23,7 +23,7 @@ You can report a bug, submit a new function enhancement suggestion, or submit a - Fork a `ShardingSphere` repo to your own repo to work, then setting upstream. ```shell -git remote add upstream https://github.com/apache/incubator-shardingsphere.git +git remote add upstream https://github.com/apache/shardingsphere.git ``` ### Choose Issue diff --git a/docs/community/content/contribute/document-contributor.cn.md b/docs/community/content/contribute/document-contributor.cn.md index 9e025a3988..3802951188 100644 --- a/docs/community/content/contribute/document-contributor.cn.md +++ b/docs/community/content/contribute/document-contributor.cn.md @@ -17,12 +17,12 @@ chapter = true ## Fork文档项目 -Fork [ShardingSphere](https://github.com/apache/incubator-shardingsphere)的master分支。 +Fork [ShardingSphere](https://github.com/apache/shardingsphere)的master分支。 ## 目录结构说明 ``` -incubator-shardingsphere +shardingsphere ├─docs ├─community │ ├─archetypes @@ -70,12 +70,12 @@ incubator-shardingsphere ## 文档基础知识 -ShardingSphere文档使用Markdown编写，并使用Hugo进行处理生成html，部署于[asf-site](https://github.com/apache/incubator-shardingsphere-doc/tree/asf-site)分支，源代码位于[Github](https://github.com/apache/incubator-shardingsphere/tree/master) 。 +ShardingSphere文档使用Markdown编写，并使用Hugo进行处理生成html，部署于[asf-site](https://github.com/apache/shardingsphere-doc/tree/asf-site)分支，源代码位于[Github](https://github.com/apache/shardingsphere/tree/master) 。 - [官方教程最新版本](https://shardingsphere.apache.org/document/current/cn/overview/)源存储在`/document/` - [社区介绍及贡献](https://shardingsphere.apache.org/community/cn/contribute/)相关文档源都储存在`/community/content/` -您可以从[Github](https://github.com/apache/incubator-shardingsphere/issues)网站上提交问题，编辑内容和查看其他人的更改 +您可以从[Github](https://github.com/apache/shardingsphere/issues)网站上提交问题，编辑内容和查看其他人的更改 ## 页面模板 @@ -95,7 +95,7 @@ ShardingSphere文档使用Markdown编写，并使用Hugo进行处理生成html 1. 提出建议修复的方式 -1. 在[Issues](https://github.com/apache/incubator-shardingsphere/issues)中`New issue` 提出您的问题 +1. 在[Issues](https://github.com/apache/shardingsphere/issues)中`New issue` 提出您的问题 ## 提交更改 diff --git a/docs/community/content/contribute/document-contributor.en.md b/docs/community/content/contribute/document-contributor.en.md index d060bda55f..01e189a532 100644 --- a/docs/community/content/contribute/document-contributor.en.md +++ b/docs/community/content/contribute/document-contributor.en.md @@ -15,13 +15,13 @@ In the contributor guide, we have mentioned how to submit Issues and pull reques - Familiar with [Hugo](https://gohugo.io/) ## Fock document -Fock the master branch of [ShardingSphere](https://github.com/apache/incubator-shardingsphere). +Fock the master branch of [ShardingSphere](https://github.com/apache/shardingsphere). ## Directory structure description ``` -incubator-shardingsphere +shardingsphere ├─docs ├─community │ ├─archetypes @@ -69,12 +69,12 @@ incubator-shardingsphere ## Document Basics -The ShardingSphere document is written in markdown, processed in Hugo, generated HTML, deployed in [asf-site](https://github.com/apache/incubator-shardingsphere-doc/tree/asf-site) branch, and the source code is located in [Github](https://github.com/apache/incubator-shardingsphere/tree/master). +The ShardingSphere document is written in markdown, processed in Hugo, generated HTML, deployed in [asf-site](https://github.com/apache/shardingsphere-doc/tree/asf-site) branch, and the source code is located in [Github](https://github.com/apache/shardingsphere/tree/master). - [Latest version Official course](https://shardingsphere.apache.org/document/current/en/overview/) source is stored in `/document/` - [Community introduction and contribution](https://shardingsphere.apache.org/community/en/contribute/) related document sources are stored in `/community/content/` -You can submit questions, edit content, and view other people's changes from [Github](https://github.com/apache/incubator-shardingsphere/issues). +You can submit questions, edit content, and view other people's changes from [Github](https://github.com/apache/shardingsphere/issues). ## Page template @@ -90,7 +90,7 @@ Anyone with a GitHub account can ask questions (error reports) about shardingsph 1. Describe the problem in detail. 1. Describe the problems caused to users. 1. Propose the repair method. -1. In [Issues](https://github.com/apache/incubator-shardingsphere/issues),`New issue ` asks your question. +1. In [Issues](https://github.com/apache/shardingsphere/issues),`New issue ` asks your question. ## Submission changes diff --git a/docs/community/content/contribute/release.cn.md b/docs/community/content/contribute/release.cn.md index 207115d6a4..6d42fc525c 100644 --- a/docs/community/content/contribute/release.cn.md +++ b/docs/community/content/contribute/release.cn.md @@ -126,18 +126,18 @@ gpg --keyserver hkp://pool.sks-keyservers.net --send-key 700E6065 ### 更新版本说明 ``` -https://github.com/apache/incubator-shardingsphere/blob/master/RELEASE-NOTES.md +https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md ``` ### 创建发布分支 -假设从github下载的ShardingSphere源代码在`~/incubator-shardingsphere/`目录；假设即将发布的版本为`${RELEASE.VERSION}`。 +假设从github下载的ShardingSphere源代码在`~/shardingsphere/`目录；假设即将发布的版本为`${RELEASE.VERSION}`。 创建`${RELEASE.VERSION}-release`分支，接下来的操作都在该分支进行。 ```shell ## ${name}为源码所在分支，如：master，dev-4.x -git clone --branch ${name} https://github.com/apache/incubator-shardingsphere.git ~/incubator-shardingsphere -cd ~/incubator-shardingsphere/ +git clone --branch ${name} https://github.com/apache/shardingsphere.git ~/shardingsphere +cd ~/shardingsphere/ git pull git checkout -b ${RELEASE.VERSION}-release git push origin ${RELEASE.VERSION}-release @@ -205,7 +205,7 @@ cd ~/ss_svn/dev/ 创建完毕后，从Apache SVN检出shardingsphere发布目录。 ```shell -svn --username=${APACHE LDAP 用户名} co https://dist.apache.org/repos/dist/dev/incubator/shardingsphere +svn --username=${APACHE LDAP 用户名} co https://dist.apache.org/repos/dist/dev/shardingsphere cd ~/ss_svn/dev/shardingsphere ``` @@ -229,26 +229,26 @@ cd ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} 将源码包、二进制包和sharding-proxy可执行二进制包添加至SVN工作目录。 ```shell -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/shardingsphere-src-distribution/target/*.zip ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/shardingsphere-src-distribution/target/*.zip.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-jdbc-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-jdbc-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-proxy-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-proxy-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-scaling-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-scaling-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-ui-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-ui-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/shardingsphere-src-distribution/target/*.zip ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/shardingsphere-src-distribution/target/*.zip.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-jdbc-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-jdbc-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-proxy-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-proxy-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-scaling-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-scaling-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-ui-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-ui-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} ``` ### 生成文件签名 ```shell -shasum -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip >> apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip.sha512 -shasum -b -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz >> apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.sha512 -shasum -b -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz >> apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.sha512 -shasum -b -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz >> apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.sha512 -shasum -b -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz >> apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.sha512 +shasum -a 512 apache-shardingsphere-${RELEASE.VERSION}-src.zip >> apache-shardingsphere-${RELEASE.VERSION}-src.zip.sha512 +shasum -b -a 512 apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz >> apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.sha512 +shasum -b -a 512 apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz >> apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.sha512 +shasum -b -a 512 apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz >> apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.sha512 +shasum -b -a 512 apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz >> apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.sha512 ``` @@ -263,11 +263,11 @@ svn --username=${APACHE LDAP 用户名} commit -m "release ${RELEASE.VERSION}" ### 检查sha512哈希 ```shell -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip.sha512 -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.sha512 -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.sha512 -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.sha512 -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-src.zip.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.sha512 ``` ### 检查gpg签名 @@ -275,7 +275,7 @@ shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.ta 首先导入发布人公钥。从svn仓库导入KEYS到本地环境。（发布版本的人不需要再导入，帮助做验证的人需要导入，用户名填发版人的即可） ```shell -curl https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/KEYS >> KEYS +curl https://dist.apache.org/repos/dist/dev/shardingsphere/KEYS >> KEYS gpg --import KEYS gpg --edit-key "${发布人的gpg用户名}" > trust @@ -298,11 +298,11 @@ Your decision? 5 然后进行gpg签名检查。 ```shell -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-src.zip.asc apache-shardingsphere-${RELEASE.VERSION}-src.zip +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.asc apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.asc apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.asc apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.asc apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz ``` ### 检查发布文件内容 @@ -310,16 +310,14 @@ gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin #### 对比源码包与Github上tag的内容差异 ``` -curl -Lo tag-${RELEASE.VERSION}.zip https://github.com/apache/incubator-shardingsphere/archive/${RELEASE.VERSION}.zip | unzip -unzip apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip -diff -r apache-shardingsphere-incubating-${RELEASE.VERSION}-src tag-${RELEASE.VERSION} +curl -Lo tag-${RELEASE.VERSION}.zip https://github.com/apache/shardingsphere/archive/${RELEASE.VERSION}.zip | unzip +unzip apache-shardingsphere-${RELEASE.VERSION}-src.zip +diff -r apache-shardingsphere-${RELEASE.VERSION}-src tag-${RELEASE.VERSION} ``` #### 检查源码包的文件内容 - 检查源码包是否包含由于包含不必要文件，致使tarball过于庞大 -- 文件夹包含单词`incubating` -- 存在`DISCLAIMER`文件 - 存在`LICENSE`和`NOTICE`文件 - `NOTICE`文件中的年份正确 - 只存在文本文件，不存在二进制文件 @@ -329,12 +327,10 @@ diff -r apache-shardingsphere-incubating-${RELEASE.VERSION}-src tag-${RELEASE.VE #### 检查二进制包的文件内容 -解压缩`apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz`，`apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz`， -`apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz` 和 `apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz` +解压缩`apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz`，`apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz`， +`apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz` 和 `apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz` 进行如下检查: -- 文件夹包含单词`incubating` -- 存在`DISCLAIMER`文件 - 存在`LICENSE`和`NOTICE`文件 - `NOTICE`文件中的年份正确 - 所有文本文件开头都有ASF许可证 @@ -353,9 +349,9 @@ diff -r apache-shardingsphere-incubating-${RELEASE.VERSION}-src tag-${RELEASE.VE 1. ShardingSphere社区投票，发起投票邮件到`dev@shardingsphere.apache.org`。PPMC需要先按照文档检查版本的正确性，然后再进行投票。 经过至少72小时并统计到3个`+1 PPMC member`票后，即可进入下一阶段的投票。 -2. Apache社区投票，发起投票邮件到`general@incubator.apache.org`。经过至少72小时并统计到3个`+1 binding`票后（只有IPMC的票才是binding），即可进行正式发布。 +2. Apache社区投票，发起投票邮件到`general@apache.org`。经过至少72小时并统计到3个`+1 binding`票后（只有IPMC的票才是binding），即可进行正式发布。 -3. 宣布投票结果,发起投票结果邮件到`general@incubator.apache.org`。 +3. 宣布投票结果,发起投票结果邮件到`general@apache.org`。 ### 投票模板 @@ -366,7 +362,7 @@ diff -r apache-shardingsphere-incubating-${RELEASE.VERSION}-src tag-${RELEASE.VE 标题： ``` -[VOTE] Release Apache ShardingSphere (Incubating) ${RELEASE.VERSION} +[VOTE] Release Apache ShardingSphere ${RELEASE.VERSION} ``` 正文： @@ -374,25 +370,25 @@ diff -r apache-shardingsphere-incubating-${RELEASE.VERSION}-src tag-${RELEASE.VE ``` Hello ShardingSphere Community, -This is a call for vote to release Apache ShardingSphere (Incubating) version ${RELEASE.VERSION} +This is a call for vote to release Apache ShardingSphere version ${RELEASE.VERSION} Release notes: -https://github.com/apache/incubator-shardingsphere/blob/master/RELEASE-NOTES.md +https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md The release candidates: -https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/${RELEASE.VERSION}/ +https://dist.apache.org/repos/dist/dev/shardingsphere/${RELEASE.VERSION}/ Maven 2 staging repository: https://repository.apache.org/content/repositories/${STAGING.REPOSITORY}/org/apache/shardingsphere/ Git tag for the release: -https://github.com/apache/incubator-shardingsphere/tree/${RELEASE.VERSION}/ +https://github.com/apache/shardingsphere/tree/${RELEASE.VERSION}/ Release Commit ID: -https://github.com/apache/incubator-shardingsphere/commit/xxxxxxxxxxxxxxxxxxxxxxx +https://github.com/apache/shardingsphere/commit/xxxxxxxxxxxxxxxxxxxxxxx Keys to verify the Release Candidate: -https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/KEYS +https://dist.apache.org/repos/dist/dev/shardingsphere/KEYS Look at here for how to verify this release candidate: https://shardingsphere.apache.org/community/en/contribute/release/ @@ -429,7 +425,7 @@ Checklist for reference: 正文： ``` -The vote to release Apache ShardingSphere (Incubating) ${RELEASE.VERSION} has passed. +The vote to release Apache ShardingSphere ${RELEASE.VERSION} has passed. 7 PPMC member +1 votes: @@ -452,7 +448,7 @@ Thank you everyone for taking the time to review the release and help us. 标题： ``` -[VOTE] Release Apache ShardingSphere (Incubating) ${RELEASE.VERSION} +[VOTE] Release Apache ShardingSphere ${RELEASE.VERSION} ``` 正文： @@ -460,13 +456,12 @@ Thank you everyone for taking the time to review the release and help us. ``` Hello all, -This is a call for vote to release Apache ShardingSphere (Incubating) version ${RELEASE.VERSION}. +This is a call for vote to release Apache ShardingSphere version ${RELEASE.VERSION}. The Apache ShardingSphere community has voted on and approved a proposal to release -Apache ShardingSphere (Incubating) version ${RELEASE.VERSION}. +Apache ShardingSphere version ${RELEASE.VERSION}. -We now kindly request the Incubator PMC members review and vote on this -incubator release. +We now kindly request the PMC members review and vote on this release. ShardingSphere is an open-source ecosystem consisted of a set of distributed database middleware solutions, including 2 independent products, Sharding-JDBC & Sharding-Proxy. They both provide functions of data sharding, distributed transaction and database orchestration, applicable in a variety of situations such as Java isomorphism, heterogeneous language. @@ -493,22 +488,22 @@ ShardingSphere community vote and result thread: https://lists.apache.org/thread.html/xxxxxxxxxxxxxxxxxxxxxxx Release notes: -https://github.com/apache/incubator-shardingsphere/blob/master/RELEASE-NOTES.md +https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md The release candidates: -https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/${RELEASE.VERSION}/ +https://dist.apache.org/repos/dist/dev/shardingsphere/${RELEASE.VERSION}/ Maven 2 staging repository: https://repository.apache.org/content/repositories/${STAGING.REPOSITORY}/org/apache/shardingsphere/ Git tag for the release: -https://github.com/apache/incubator-shardingsphere/tree/${RELEASE.VERSION} +https://github.com/apache/shardingsphere/tree/${RELEASE.VERSION} Release Commit ID: -https://github.com/apache/incubator-shardingsphere/commit/xxxxxxxxxxxxxxxxxxxxxxx/ +https://github.com/apache/shardingsphere/commit/xxxxxxxxxxxxxxxxxxxxxxx/ Keys to verify the Release Candidate: -https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/KEYS +https://dist.apache.org/repos/dist/dev/shardingsphere/KEYS Look at here for how to verify this release candidate: https://shardingsphere.apache.org/community/en/contribute/release/ @@ -556,7 +551,7 @@ The following votes are carried over from ShardingSphere dev mailing list, 标题： ``` -[RESULT][VOTE] Release Apache ShardingSphere (Incubating) ${RELEASE.VERSION} +[RESULT][VOTE] Release Apache ShardingSphere ${RELEASE.VERSION} ``` 正文： @@ -579,9 +574,9 @@ I will process to publish the release and send ANNOUNCE. ### 将源码、二进制包以及KEYS从svn的dev目录移动到release目录 ```shell -svn mv https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/${RELEASE.VERSION} https://dist.apache.org/repos/dist/release/incubator/shardingsphere/ -m "transfer packages for ${RELEASE.VERSION}" -svn delete https://dist.apache.org/repos/dist/release/incubator/shardingsphere/KEYS -m "delete KEYS" -svn cp https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/KEYS https://dist.apache.org/repos/dist/release/incubator/shardingsphere/ -m "transfer KEYS for ${RELEASE.VERSION}" +svn mv https://dist.apache.org/repos/dist/dev/shardingsphere/${RELEASE.VERSION} https://dist.apache.org/repos/dist/release/shardingsphere/ -m "transfer packages for ${RELEASE.VERSION}" +svn delete https://dist.apache.org/repos/dist/release/shardingsphere/KEYS -m "delete KEYS" +svn cp https://dist.apache.org/repos/dist/dev/shardingsphere/KEYS https://dist.apache.org/repos/dist/release/shardingsphere/ -m "transfer KEYS for ${RELEASE.VERSION}" ``` ### 在Apache Staging仓库找到ShardingSphere并点击`Release` @@ -611,7 +606,7 @@ https://shardingsphere.apache.org/document/current/en/downloads/ https://shardingsphere.apache.org/document/current/cn/downloads/ -`最新版本`中保留两个最新的版本。历史版本会自动归档到[Archive incubating repository](https://archive.apache.org/dist/incubator/shardingsphere/) +`最新版本`中保留两个最新的版本。历史版本会自动归档到[Archive repository](https://archive.apache.org/dist/shardingsphere/) ### 发布Docker @@ -622,7 +617,7 @@ https://shardingsphere.apache.org/document/current/cn/downloads/ #### 编译Docker镜像 ```shell -cd ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-proxy-distribution/ +cd ~/shardingsphere/shardingsphere/sharding-distribution/sharding-proxy-distribution/ mvn clean package docker:build ``` @@ -648,15 +643,15 @@ docker push apache/sharding-proxy:${RELEASE_VERSION} ### GitHub版本发布 -在[GitHub Releases](https://github.com/apache/incubator-shardingsphere/releases)页面的`${RELEASE_VERSION}`版本上点击`Edit` +在[GitHub Releases](https://github.com/apache/shardingsphere/releases)页面的`${RELEASE_VERSION}`版本上点击`Edit` 编辑版本号及版本说明，并点击`Publish release` ### 为ShardingSphere的Example项目打标记 -[GitHub仓库地址](https://github.com/apache/incubator-shardingsphere-example) +[GitHub仓库地址](https://github.com/apache/shardingsphere-example) -### 发送邮件到`general@incubator.apache.org`和`dev@shardingsphere.apache.org`通知完成版本发布 +### 发送邮件到`general@apache.org`和`dev@shardingsphere.apache.org`通知完成版本发布 通知邮件模板： @@ -671,7 +666,7 @@ docker push apache/sharding-proxy:${RELEASE_VERSION} ``` Hi all, -Apache ShardingSphere (incubating) Team is glad to announce the first release of Apache ShardingSphere Incubating ${RELEASE.VERSION}. +Apache ShardingSphere Team is glad to announce the first release of Apache ShardingSphere ${RELEASE.VERSION}. ShardingSphere is an open-source ecosystem consisted of a set of distributed database middleware solutions, including 2 independent products, Sharding-JDBC & Sharding-Proxy. They both provide functions of data sharding, distributed transaction and database orchestration, applicable in a variety of situations such as Java isomorphism, heterogeneous language. @@ -681,27 +676,17 @@ Therefore, at the current stage, we prefer to focus on its increment instead of Download Links: https://shardingsphere.apache.org/document/current/en/downloads/ -Release Notes: https://github.com/apache/incubator-shardingsphere/blob/master/RELEASE-NOTES.md +Release Notes: https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md Website: https://shardingsphere.apache.org/ ShardingSphere Resources: -- Issue: https://github.com/apache/incubator-shardingsphere/issues/ +- Issue: https://github.com/apache/shardingsphere/issues/ - Mailing list: dev@shardingsphere.apache.org - Documents: https://shardingsphere.apache.org/document/current/ -- Apache ShardingSphere (incubating) Team - - -===== -*Disclaimer* - -Apache ShardingSphere (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. +- Apache ShardingSphere Team ``` diff --git a/docs/community/content/contribute/release.en.md b/docs/community/content/contribute/release.en.md index a3fe87076a..4d6491c9b7 100644 --- a/docs/community/content/contribute/release.en.md +++ b/docs/community/content/contribute/release.en.md @@ -127,18 +127,18 @@ For encryption settings, please see [here](http://maven.apache.org/guides/mini/g ### Update Release Notes ``` -https://github.com/apache/incubator-shardingsphere/blob/master/RELEASE-NOTES.md +https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md ``` ### Create Release Branch -Suppose ShardingSphere source codes downloaded from github is under `~/incubator-shardingsphere/` directory and the version to be released is `4.0.0-RC`. +Suppose ShardingSphere source codes downloaded from github is under `~/shardingsphere/` directory and the version to be released is `4.0.0-RC`. Create `${RELEASE.VERSION}-release` branch, where all the following operations are performed. ```shell ## ${name} is the properly branch, e.g. master, dev-4.x -git clone --branch ${name} https://github.com/apache/incubator-shardingsphere.git ~/incubator-shardingsphere -cd ~/incubator-shardingsphere/ +git clone --branch ${name} https://github.com/apache/shardingsphere.git ~/shardingsphere +cd ~/shardingsphere/ git pull git checkout -b ${RELEASE.VERSION}-release git push origin ${RELEASE.VERSION}-release @@ -206,7 +206,7 @@ cd ~/ss_svn/dev/ After the creation, checkout ShardingSphere release directory from Apache SVN. ```shell -svn --username=${APACHE LDAP username} co https://dist.apache.org/repos/dist/dev/incubator/shardingsphere +svn --username=${APACHE LDAP username} co https://dist.apache.org/repos/dist/dev/shardingsphere cd ~/ss_svn/dev/shardingsphere ``` @@ -231,26 +231,26 @@ cd ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} Add source code packages, binary packages and executable binary packages of sharding-proxy to SVN working directory. ```shell -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/shardingsphere-src-distribution/target/*.zip ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/shardingsphere-src-distribution/target/*.zip.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-jdbc-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-jdbc-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-proxy-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-proxy-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-scaling-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-scaling-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-ui-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} -cp -f ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-ui-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/shardingsphere-src-distribution/target/*.zip ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/shardingsphere-src-distribution/target/*.zip.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-jdbc-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-jdbc-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-proxy-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-proxy-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-scaling-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-scaling-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-ui-distribution/target/*.tar.gz ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} +cp -f ~/shardingsphere/shardingsphere/sharding-distribution/sharding-ui-distribution/target/*.tar.gz.asc ~/ss_svn/dev/shardingsphere/${RELEASE.VERSION} ``` ### Generate sign files ```shell -shasum -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip >> apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip.sha512 -shasum -b -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz >> apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.sha512 -shasum -b -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz >> apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.sha512 -shasum -b -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz >> apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.sha512 -shasum -b -a 512 apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz >> apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.sha512 +shasum -a 512 apache-shardingsphere-${RELEASE.VERSION}-src.zip >> apache-shardingsphere-${RELEASE.VERSION}-src.zip.sha512 +shasum -b -a 512 apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz >> apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.sha512 +shasum -b -a 512 apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz >> apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.sha512 +shasum -b -a 512 apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz >> apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.sha512 +shasum -b -a 512 apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz >> apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.sha512 ``` ### Commit to Apache SVN @@ -265,11 +265,11 @@ svn --username=${APACHE LDAP username} commit -m "release ${RELEASE.VERSION}" ### Check sha512 hash ```shell -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip.sha512 -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.sha512 -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.sha512 -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.sha512 -shasum -c apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-src.zip.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.sha512 +shasum -c apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.sha512 ``` ### Check gpg Signature @@ -278,7 +278,7 @@ First, import releaser's public key. Import KEYS from SVN repository to local. (The releaser does not need to import again; the checking assistant needs to import it, with the user name filled as the releaser's. ) ```shell -curl https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/KEYS >> KEYS +curl https://dist.apache.org/repos/dist/dev/shardingsphere/KEYS >> KEYS gpg --import KEYS gpg --edit-key "${GPG username of releaser}" > trust @@ -301,11 +301,11 @@ Your decision? 5 Then, check the gpg signature. ```shell -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz -gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.asc apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-src.zip.asc apache-shardingsphere-${RELEASE.VERSION}-src.zip +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz.asc apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz.asc apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz.asc apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz +gpg --verify apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz.asc apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz ``` ### Check Released Files @@ -313,16 +313,14 @@ gpg --verify apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin #### compare release source with github tag ``` -curl -Lo tag-${RELEASE.VERSION}.zip https://github.com/apache/incubator-shardingsphere/archive/${RELEASE.VERSION}.zip | unzip -unzip apache-shardingsphere-incubating-${RELEASE.VERSION}-src.zip -diff -r apache-shardingsphere-incubating-${RELEASE.VERSION}-src tag-${RELEASE.VERSION} +curl -Lo tag-${RELEASE.VERSION}.zip https://github.com/apache/shardingsphere/archive/${RELEASE.VERSION}.zip | unzip +unzip apache-shardingsphere-${RELEASE.VERSION}-src.zip +diff -r apache-shardingsphere-${RELEASE.VERSION}-src tag-${RELEASE.VERSION} ``` #### Check source package * Check whether source tarball is oversized for including nonessential files -* The release files have the word `incubating` in their name -* `DISCLAIMER` file exists * `LICENSE` and `NOTICE` files exist * Correct year in `NOTICE` file * There is only text files but no binary files @@ -332,12 +330,10 @@ diff -r apache-shardingsphere-incubating-${RELEASE.VERSION}-src tag-${RELEASE.VE #### Check binary packages -Decompress `apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz`, `apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz` , -`apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz` and `apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-ui-bin.tar.gz` +Decompress `apache-shardingsphere-${RELEASE.VERSION}-sharding-jdbc-bin.tar.gz`, `apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz` , +`apache-shardingsphere-${RELEASE.VERSION}-sharding-scaling-bin.tar.gz` and `apache-shardingsphere-${RELEASE.VERSION}-sharding-ui-bin.tar.gz` to check the following items: -* The release files have the word `incubating` in their name -* `DISCLAIMER` file exists * `LICENSE` and `NOTICE` files exist * Correct year in `NOTICE` file * All text files have ASF headers @@ -357,10 +353,10 @@ For the whole check list, please see [here](https://cwiki.apache.org/confluence/ PPMC needs to check the rightness of the version according to the document before they vote. After at least 72 hours and with at least 3 `+1 PPMC member` votes, it can come to the next stage of the vote. -2. Apache community vote: send the vote e-mail to `general@incubator.apache.org`. +2. Apache community vote: send the vote e-mail to `general@apache.org`. After at least 72 hours and with at least 3 `+1 binding` votes (only IPMC's votes are binding), it can be officially released. -3. Announce the vote result: send the result vote e-mail to `general@incubator.apache.org`. +3. Announce the vote result: send the result vote e-mail to `general@apache.org`. ### Vote Templates @@ -371,7 +367,7 @@ NOTE: Must invite all mentors to vote during the community vote. Title: ``` -[VOTE] Release Apache ShardingSphere (Incubating) ${RELEASE.VERSION} +[VOTE] Release Apache ShardingSphere ${RELEASE.VERSION} ``` @@ -380,25 +376,25 @@ Body: ``` Hello ShardingSphere Community, -This is a call for vote to release Apache ShardingSphere (Incubating) version ${RELEASE.VERSION} +This is a call for vote to release Apache ShardingSphere version ${RELEASE.VERSION} Release notes: -https://github.com/apache/incubator-shardingsphere/blob/master/RELEASE-NOTES.md +https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md The release candidates: -https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/${RELEASE.VERSION}/ +https://dist.apache.org/repos/dist/dev/shardingsphere/${RELEASE.VERSION}/ Maven 2 staging repository: https://repository.apache.org/content/repositories/${STAGING.REPOSITORY}/org/apache/shardingsphere/ Git tag for the release: -https://github.com/apache/incubator-shardingsphere/tree/${RELEASE.VERSION} +https://github.com/apache/shardingsphere/tree/${RELEASE.VERSION} Release Commit ID: -https://github.com/apache/incubator-shardingsphere/commit/xxxxxxxxxxxxxxxxxxxxxxx +https://github.com/apache/shardingsphere/commit/xxxxxxxxxxxxxxxxxxxxxxx Keys to verify the Release Candidate: -https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/KEYS +https://dist.apache.org/repos/dist/dev/shardingsphere/KEYS Look at here for how to verify this release candidate: https://shardingsphere.apache.org/community/en/contribute/release/ @@ -435,7 +431,7 @@ Checklist for reference: Body: ``` -The vote to release Apache ShardingSphere (Incubating) ${RELEASE.VERSION} has passed. +The vote to release Apache ShardingSphere ${RELEASE.VERSION} has passed. 7 PPMC member +1 votes: @@ -458,7 +454,7 @@ Thank you everyone for taking the time to review the release and help us. Title: ``` -[VOTE] Release Apache ShardingSphere (Incubating) ${RELEASE.VERSION} +[VOTE] Release Apache ShardingSphere ${RELEASE.VERSION} ``` @@ -467,13 +463,12 @@ Body: ``` Hello all, -This is a call for vote to release Apache ShardingSphere (Incubating) version ${RELEASE.VERSION}. +This is a call for vote to release Apache ShardingSphere version ${RELEASE.VERSION}. The Apache ShardingSphere community has voted on and approved a proposal to release -Apache ShardingSphere (Incubating) version ${RELEASE.VERSION}. +Apache ShardingSphere version ${RELEASE.VERSION}. -We now kindly request the Incubator PMC members review and vote on this -incubator release. +We now kindly request the PMC members review and vote on this release. ShardingSphere is an open-source ecosystem consisted of a set of distributed database middleware solutions, including 2 independent products, Sharding-JDBC & Sharding-Proxy. They both provide functions of data sharding, distributed transaction and database orchestration, applicable in a variety of situations such as Java isomorphism, heterogeneous language. @@ -500,22 +495,22 @@ ShardingSphere community vote and result thread: https://lists.apache.org/thread.html/xxxxxxxxxxxxxxxxxxxxxxx Release notes: -https://github.com/apache/incubator-shardingsphere/blob/master/RELEASE-NOTES.md +https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md The release candidates: -https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/${RELEASE.VERSION}/ +https://dist.apache.org/repos/dist/dev/shardingsphere/${RELEASE.VERSION}/ Maven 2 staging repository: https://repository.apache.org/content/repositories/${STAGING.REPOSITORY}/org/apache/shardingsphere/ Git tag for the release: -https://github.com/apache/incubator-shardingsphere/tree/${RELEASE.VERSION} +https://github.com/apache/shardingsphere/tree/${RELEASE.VERSION} Release Commit ID: -https://github.com/apache/incubator-shardingsphere/commit/xxxxxxxxxxxxxxxxxxxxxxx +https://github.com/apache/shardingsphere/commit/xxxxxxxxxxxxxxxxxxxxxxx Keys to verify the Release Candidate: -https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/KEYS +https://dist.apache.org/repos/dist/dev/shardingsphere/KEYS Look at here for how to verify this release candidate: https://shardingsphere.apache.org/community/en/contribute/release/ @@ -564,7 +559,7 @@ The following votes are carried over from ShardingSphere dev mailing list, Title： ``` -[RESULT][VOTE] Release Apache ShardingSphere (Incubating) ${RELEASE.VERSION} +[RESULT][VOTE] Release Apache ShardingSphere ${RELEASE.VERSION} ``` Body: @@ -588,9 +583,9 @@ I will process to publish the release and send ANNOUNCE. ### Move source packages, binary packages and KEYS from the `dev` directory to `release` directory ```shell -svn mv https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/${RELEASE.VERSION} https://dist.apache.org/repos/dist/release/incubator/shardingsphere/ -m "transfer packages for ${RELEASE.VERSION}" -svn delete https://dist.apache.org/repos/dist/release/incubator/shardingsphere/KEYS -m "delete KEYS" -svn cp https://dist.apache.org/repos/dist/dev/incubator/shardingsphere/KEYS https://dist.apache.org/repos/dist/release/incubator/shardingsphere/ -m "transfer KEYS for ${RELEASE.VERSION}" +svn mv https://dist.apache.org/repos/dist/dev/shardingsphere/${RELEASE.VERSION} https://dist.apache.org/repos/dist/release/shardingsphere/ -m "transfer packages for ${RELEASE.VERSION}" +svn delete https://dist.apache.org/repos/dist/release/shardingsphere/KEYS -m "delete KEYS" +svn cp https://dist.apache.org/repos/dist/dev/shardingsphere/KEYS https://dist.apache.org/repos/dist/release/shardingsphere/ -m "transfer KEYS for ${RELEASE.VERSION}" ``` ### Find ShardingSphere in staging repository and click `Release` @@ -620,7 +615,7 @@ https://shardingsphere.apache.org/document/current/en/downloads/ https://shardingsphere.apache.org/document/current/cn/downloads/ -Keep two latest versions in `Latest releases`. All old versions will be archived automatically in [Archive incubating repository](https://archive.apache.org/dist/incubator/shardingsphere/) +Keep two latest versions in `Latest releases`. All old versions will be archived automatically in [Archive repository](https://archive.apache.org/dist/shardingsphere/) ### Docker Release @@ -631,7 +626,7 @@ Install docker locally and start the docker service #### Compile Docker Image ```shell -cd ~/shardingsphere/incubator-shardingsphere/sharding-distribution/sharding-proxy-distribution/ +cd ~/shardingsphere/shardingsphere/sharding-distribution/sharding-proxy-distribution/ mvn clean package docker:build ``` @@ -657,15 +652,15 @@ Login [Docker Hub](https://hub.docker.com/r/apache/sharding-proxy/) to check whe ### Publish release in GitHub -Click `Edit` in [GitHub Releases](https://github.com/apache/incubator-shardingsphere/releases)'s `${RELEASE_VERSION}` version +Click `Edit` in [GitHub Releases](https://github.com/apache/shardingsphere/releases)'s `${RELEASE_VERSION}` version Edit version number and release notes, click `Publish release` ### Tag ShardingSphere's Example Project -[GitHub repository](https://github.com/apache/incubator-shardingsphere-example) +[GitHub repository](https://github.com/apache/shardingsphere-example) -### Send e-mail to `general@incubator.apache.org` and `dev@shardingsphere.apache.org` to announce the release is finished +### Send e-mail to `general@apache.org` and `dev@shardingsphere.apache.org` to announce the release is finished Announcement e-mail template: @@ -680,7 +675,7 @@ Body: ``` Hi all, -Apache ShardingSphere (incubating) Team is glad to announce the first release of Apache ShardingSphere Incubating ${RELEASE.VERSION}. +Apache ShardingSphere Team is glad to announce the first release of Apache ShardingSphere ${RELEASE.VERSION}. ShardingSphere is an open-source ecosystem consisted of a set of distributed database middleware solutions, including 2 independent products, Sharding-JDBC & Sharding-Proxy. They both provide functions of data sharding, distributed transaction and database orchestration, applicable in a variety of situations such as Java isomorphism, heterogeneous language. @@ -690,27 +685,17 @@ Therefore, at the current stage, we prefer to focus on its increment instead of Download Links: https://shardingsphere.apache.org/document/current/en/downloads/ -Release Notes: https://github.com/apache/incubator-shardingsphere/blob/master/RELEASE-NOTES.md +Release Notes: https://github.com/apache/shardingsphere/blob/master/RELEASE-NOTES.md Website: https://shardingsphere.apache.org/ ShardingSphere Resources: -- Issue: https://github.com/apache/incubator-shardingsphere/issues/ +- Issue: https://github.com/apache/shardingsphere/issues/ - Mailing list: dev@shardingsphere.apache.org - Documents: https://shardingsphere.apache.org/document/current/ -- Apache ShardingSphere (incubating) Team - - -===== -*Disclaimer* - -Apache ShardingSphere (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. +- Apache ShardingSphere Team ``` diff --git a/docs/community/content/contribute/subscribe.cn.md b/docs/community/content/contribute/subscribe.cn.md index 1071578176..f358c97e87 100644 --- a/docs/community/content/contribute/subscribe.cn.md +++ b/docs/community/content/contribute/subscribe.cn.md @@ -13,6 +13,6 @@ chapter = true 完成步骤1后，您将收到一封来自[dev-help@shardingsphere.apache.org](mailto:dev-help@shardingsphere.apache.org)的确认邮件（如未收到，请确认该邮件是否已被拦截，或已经被自动归入订阅邮件、垃圾邮件、推广邮件等文件夹）。直接回复该邮件，或点击邮件里的链接快捷回复即可，主题和内容任意。 1. 接收欢迎邮件。 -完成以上步骤后，您会收到一封主题为`WELCOME to dev@shardingsphere.apache.org`的欢迎邮件，至此您已成功订阅Apache ShardingSphere（Incubating）的邮件列表。 +完成以上步骤后，您会收到一封主题为`WELCOME to dev@shardingsphere.apache.org`的欢迎邮件，至此您已成功订阅Apache ShardingSphere的邮件列表。 1. 至此，您可以通过订阅的邮箱接收及回复邮件，或通过查看[归档邮件](https://lists.apache.org/list.html?dev@shardingsphere.apache.org)来跟踪邮件对话。 diff --git a/docs/community/content/contribute/subscribe.en.md b/docs/community/content/contribute/subscribe.en.md index 2e97ed26ba..45a26e2f78 100644 --- a/docs/community/content/contribute/subscribe.en.md +++ b/docs/community/content/contribute/subscribe.en.md @@ -13,6 +13,6 @@ Use your mailbox to send an e-mail to [dev-subscribe@shardingsphere.apache.org]( After Step 1, you will receive a confirmation e-mail from [dev-help@shardingsphere.apache.org](mailto:dev-help@shardingsphere.apache.org) (if you have not receive that, please check “RSS feeds”, “junk e-mail” or other items). Reply that e-mail directly or click the link in e-mail to reply, with any subject or content. 1. Receive the welcome e-mail. -After finishing the two steps above, an e-mail with the subject of `WELCOME to dev@shardingsphere.apache.org` will be sent to your e-mail address. Until now, you have succeeded in subscribing Apache ShardingSphere（Incubating）mail-list. +After finishing the two steps above, an e-mail with the subject of `WELCOME to dev@shardingsphere.apache.org` will be sent to your e-mail address. Until now, you have succeeded in subscribing Apache ShardingSphere mail-list. 1. Until now, you can interact with community by your subscribed email or track email conversations by [Archived email list](https://lists.apache.org/list.html?dev@shardingsphere.apache.org). diff --git a/docs/community/content/powered-by/_index.cn.md b/docs/community/content/powered-by/_index.cn.md index ba93a5999c..77da2fc47e 100644 --- a/docs/community/content/powered-by/_index.cn.md +++ b/docs/community/content/powered-by/_index.cn.md @@ -9,7 +9,7 @@ chapter = true 欢迎采用了ShardingSphere的公司在此登记，您的支持是我们最大的动力。 -请按`公司名` + `首页` + `应用案例（可选）` 的格式在[此处](https://github.com/sharding-sphere/sharding-sphere/issues/234)登记。 +请按`公司名` + `首页` + `应用案例（可选）` 的格式在[此处](https://github.com/apache/shardingsphere/issues/234)登记。 ## 谁在使用ShardingSphere? diff --git a/docs/community/content/powered-by/_index.en.md b/docs/community/content/powered-by/_index.en.md index a58c1a0c86..471106ac33 100644 --- a/docs/community/content/powered-by/_index.en.md +++ b/docs/community/content/powered-by/_index.en.md @@ -9,7 +9,7 @@ chapter = true Welcome to register by company + homepage + use case(optional), your support is important to us. -Please register [here](https://github.com/sharding-sphere/sharding-sphere/issues/234) with `company` + `homepage` + `use case(optional)`. +Please register [here](https://github.com/apache/shardingsphere/issues/234) with `company` + `homepage` + `use case(optional)`. ## Who are using ShardingSphere? diff --git a/docs/community/content/team/_index.cn.md b/docs/community/content/team/_index.cn.md index b15bc96f04..e7bee26ab7 100644 --- a/docs/community/content/team/_index.cn.md +++ b/docs/community/content/team/_index.cn.md @@ -39,6 +39,7 @@ chapter = true | 董宗磊 | dongzl | | 蒋晓峰 | SteNicholas | | 岳令 | yue530tom | +| 秦金卫 | kimmking | ## 导师 @@ -52,8 +53,8 @@ chapter = true 您可以在ShardingSphere的贡献列表中找到全部的贡献者名单。 -- [incubator-shardingsphere](https://github.com/apache/incubator-shardingsphere/graphs/contributors) -- [incubator-shardingsphere-benchmark](https://github.com/apache/incubator-shardingsphere-benchmark) +- [shardingsphere](https://github.com/apache/shardingsphere/graphs/contributors) +- [shardingsphere-benchmark](https://github.com/apache/shardingsphere-benchmark) ## 成为提交者 diff --git a/docs/community/content/team/_index.en.md b/docs/community/content/team/_index.en.md index c2e5afc826..e91fe9c9e4 100644 --- a/docs/community/content/team/_index.en.md +++ b/docs/community/content/team/_index.en.md @@ -39,6 +39,7 @@ The List in alphabet order. | Zonglei Dong | dongzl | | Xiaofeng Jiang | SteNicholas | | Ling Yue | yue530tom | +| Kimm King | kimmking | ## Mentors @@ -52,8 +53,8 @@ The List in alphabet order. You can find all contributors of ShardingSphere from GitHub contribution list. -- [incubator-shardingsphere](https://github.com/apache/incubator-shardingsphere/graphs/contributors) -- [incubator-shardingsphere-benchmark](https://github.com/apache/incubator-shardingsphere-benchmark) +- [shardingsphere](https://github.com/apache/shardingsphere/graphs/contributors) +- [shardingsphere-benchmark](https://github.com/apache/shardingsphere-benchmark) ## Becoming a Committer diff --git a/docs/document/content/downloads/_index.cn.md b/docs/document/content/downloads/_index.cn.md index 650660bdbe..984cc1e0b3 100644 --- a/docs/document/content/downloads/_index.cn.md +++ b/docs/document/content/downloads/_index.cn.md @@ -20,7 +20,7 @@ ShardingSphere的发布版包括源码包及其对应的二进制包。由于下 ## 校验版本 -[PGP签名文件](https://downloads.apache.org/incubator/shardingsphere/KEYS) +[PGP签名文件](https://downloads.apache.org/shardingsphere/KEYS) 使用PGP或SHA签名验证下载文件的完整性至关重要。可以使用GPG或PGP验证PGP签名。请下载KEYS以及发布的asc签名文件。建议从主发布目录而不是镜像中获取这些文件。 @@ -43,25 +43,17 @@ pgp -ka KEYS 要验证二进制文件或源代码，您可以从主发布目录下载相关的asc文件，并按照以下指南进行操作。 ```shell -gpg --verify apache-shardingsphere-incubating-********.asc apache-shardingsphere-incubating-********* +gpg --verify apache-shardingsphere-********.asc apache-shardingsphere-********* ``` or ```shell -pgpv apache-shardingsphere-incubating-********.asc +pgpv apache-shardingsphere-********.asc ``` or ```shell -pgp apache-shardingsphere-incubating-********.asc +pgp apache-shardingsphere-********.asc ``` - -## 免责声明 - -Apache ShardingSphere (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/document/content/downloads/_index.en.md b/docs/document/content/downloads/_index.en.md index 76cb8c7170..7e42093b90 100644 --- a/docs/document/content/downloads/_index.en.md +++ b/docs/document/content/downloads/_index.en.md @@ -20,7 +20,7 @@ Find all releases in the [Archive incubating repository](https://archive.apache. ## Verify the releases -[PGP signatures KEYS](https://downloads.apache.org/incubator/shardingsphere/KEYS) +[PGP signatures KEYS](https://downloads.apache.org/shardingsphere/KEYS) It is essential that you verify the integrity of the downloaded files using the PGP or SHA signatures. The PGP signatures can be verified using GPG or PGP. Please download the KEYS as well as the asc signature files for relevant distribution. It is recommended to get these files from the main distribution directory and not from the mirrors. @@ -43,25 +43,17 @@ pgp -ka KEYS To verify the binaries/sources you can download the relevant asc files for it from main distribution directory and follow the below guide. ```shell -gpg --verify apache-shardingsphere-incubating-********.asc apache-shardingsphere-incubating-********* +gpg --verify apache-shardingsphere-********.asc apache-shardingsphere-********* ``` or ```shell -pgpv apache-shardingsphere-incubating-********.asc +pgpv apache-shardingsphere-********.asc ``` or ```shell -pgp apache-shardingsphere-incubating-********.asc +pgp apache-shardingsphere-********.asc ``` - -## Disclaimer - -Apache ShardingSphere (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/document/content/faq/_index.cn.md b/docs/document/content/faq/_index.cn.md index bf82585bcc..ca0301d7d8 100644 --- a/docs/document/content/faq/_index.cn.md +++ b/docs/document/content/faq/_index.cn.md @@ -199,7 +199,7 @@ https://ourcodeworld.com/articles/read/109/how-to-solve-filename-too-long-error- 打开cmd.exe并执行下面的命令： ``` -tar zxvf apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz +tar zxvf apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz ``` ## 15. Type is required 异常的解决方法? diff --git a/docs/document/content/faq/_index.en.md b/docs/document/content/faq/_index.en.md index 6825c0e175..aa1b09a3c0 100644 --- a/docs/document/content/faq/_index.en.md +++ b/docs/document/content/faq/_index.en.md @@ -196,7 +196,7 @@ The solutions: Open cmd.exe and execute the following command: ``` -tar zxvf apache-shardingsphere-incubating-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz +tar zxvf apache-shardingsphere-${RELEASE.VERSION}-sharding-proxy-bin.tar.gz ``` ## 15. How to solve `Type is required` error? diff --git a/docs/document/content/features/spi/_index.cn.md b/docs/document/content/features/spi/_index.cn.md index 4ae4ff0d3a..521dba83f0 100644 --- a/docs/document/content/features/spi/_index.cn.md +++ b/docs/document/content/features/spi/_index.cn.md @@ -15,7 +15,7 @@ Apache ShardingSphere之所以采用SPI方式进行扩展，是出于整体架 本章节汇总了Apache ShardingSphere所有通过SPI方式载入的功能模块。 如无特殊需求，用户可以使用Apache ShardingSphere提供的内置实现，并通过简单配置即可实现相应功能；高级用户则可以参考各个功能模块的接口进行自定义实现。 -我们非常欢迎大家将您的实现类反馈至[开源社区](https://github.com/apache/incubator-shardingsphere/pulls)，让更多用户从中收益。 +我们非常欢迎大家将您的实现类反馈至[开源社区](https://github.com/apache/shardingsphere/pulls)，让更多用户从中收益。 ### SQL解析 diff --git a/docs/document/content/features/spi/_index.en.md b/docs/document/content/features/spi/_index.en.md index 90d22e3271..9cb44d6352 100644 --- a/docs/document/content/features/spi/_index.en.md +++ b/docs/document/content/features/spi/_index.en.md @@ -11,7 +11,7 @@ In Apache ShardingSphere, many functionality implementation are uploaded through Apache ShardingSphere uses SPI to expand in order to optimize overall architecture design at most. It is to enable premier users, who have implemented interfaces provided by Apache ShardingSphere, to dynamically load self-defined implementation types. Therefore, it can satisfy their practical requirements for different scenarios, while keeping architecture integrity and functional stabilization. -This chapter has provided all the Apache ShardingSphere functional modules that are loaded through SPI. Users with no special requirements can use them to implement corresponding functions after simple configurations. Premier users can develop self-defined implementations, referring to interfaces of existing functional modules. Welcome to feed your self-defined implementations to the [open-source community](https://github.com/apache/incubator-shardingsphere/pulls), benefiting more users. +This chapter has provided all the Apache ShardingSphere functional modules that are loaded through SPI. Users with no special requirements can use them to implement corresponding functions after simple configurations. Premier users can develop self-defined implementations, referring to interfaces of existing functional modules. Welcome to feed your self-defined implementations to the [open-source community](https://github.com/apache/shardingsphere/pulls), benefiting more users. ### SQL Passing diff --git a/docs/document/content/features/test-engine/performance-test.cn.md b/docs/document/content/features/test-engine/performance-test.cn.md index 5f97985ae8..49a194ecc3 100644 --- a/docs/document/content/features/test-engine/performance-test.cn.md +++ b/docs/document/content/features/test-engine/performance-test.cn.md @@ -350,13 +350,13 @@ DELETE FROM tbl1 WHERE id=? #### 压测类 -参考[shardingsphere-benchmark](https://github.com/apache/incubator-shardingsphere-benchmark/tree/master/shardingsphere-benchmark)实现，注意阅读其中的注释 +参考[shardingsphere-benchmark](https://github.com/apache/shardingsphere-benchmark/tree/master/shardingsphere-benchmark)实现，注意阅读其中的注释 #### 编译 ```shell -git clone https://github.com/apache/incubator-shardingsphere-benchmark.git -cd incubator-shardingsphere-benchmark/shardingsphere-benchmark +git clone https://github.com/apache/shardingsphere-benchmark.git +cd shardingsphere-benchmark/shardingsphere-benchmark mvn clean install ``` @@ -365,7 +365,7 @@ mvn clean install ```shell cp target/shardingsphere-benchmark-1.0-SNAPSHOT-jar-with-dependencies.jar apache-jmeter-4.0/lib/ext jmeter –n –t test_plan/test.jmx -test.jmx参考https://github.com/apache/incubator-shardingsphere-benchmark/tree/master/report/script/test_plan/test.jmx +test.jmx参考https://github.com/apache/shardingsphere-benchmark/tree/master/report/script/test_plan/test.jmx ``` #### 压测结果处理 diff --git a/docs/document/content/features/test-engine/performance-test.en.md b/docs/document/content/features/test-engine/performance-test.en.md index 82010700fc..95e686599b 100644 --- a/docs/document/content/features/test-engine/performance-test.en.md +++ b/docs/document/content/features/test-engine/performance-test.en.md @@ -351,14 +351,14 @@ DELETE FROM tbl1 WHERE id=? #### Jmeter Class -Consider the implementation of [shardingsphere-benchmark](https://github.com/apache/incubator-shardingsphere-benchmark/tree/master/shardingsphere-benchmark) -Notes: the notes in incubator-shardingsphere-benchmark/README.md should be taken attention to +Consider the implementation of [shardingsphere-benchmark](https://github.com/apache/shardingsphere-benchmark/tree/master/shardingsphere-benchmark) +Notes: the notes in shardingsphere-benchmark/README.md should be taken attention to #### Compile & Build ```shell -git clone https://github.com/apache/incubator-shardingsphere-benchmark.git -cd incubator-shardingsphere-benchmark/shardingsphere-benchmark +git clone https://github.com/apache/shardingsphere-benchmark.git +cd shardingsphere-benchmark/shardingsphere-benchmark mvn clean install ``` @@ -367,7 +367,7 @@ mvn clean install ```shell cp target/shardingsphere-benchmark-1.0-SNAPSHOT-jar-with-dependencies.jar apache-jmeter-4.0/lib/ext jmeter –n –t test_plan/test.jmx -test.jmx example:https://github.com/apache/incubator-shardingsphere-benchmark/tree/master/report/script/test_plan/test.jmx +test.jmx example:https://github.com/apache/shardingsphere-benchmark/tree/master/report/script/test_plan/test.jmx ``` #### Process Result Data diff --git a/docs/document/content/manual/sharding-jdbc/configuration/config-java.cn.md b/docs/document/content/manual/sharding-jdbc/configuration/config-java.cn.md index 1314af2dcb..48fd41a49d 100644 --- a/docs/document/content/manual/sharding-jdbc/configuration/config-java.cn.md +++ b/docs/document/content/manual/sharding-jdbc/configuration/config-java.cn.md @@ -7,7 +7,7 @@ weight = 1 ### 数据分片 -以下配置中DataSourceUtil的实现为[DataSourceUtil](https://github.com/geomonlin/incubator-shardingsphere-example/blob/4.0.0-RC2/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtil.java)，ModuloShardingTableAlgorithm 类需用户自定义实现，详细例子 [ModuloShardingTableAlgorithm](https://github.com/geomonlin/incubator-shardingsphere-example/tree/dev/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm) +以下配置中DataSourceUtil的实现为[DataSourceUtil](https://github.com/geomonlin/incubator-shardingsphere-example/blob/4.0.0-RC2/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtil.java)，ModuloShardingTableAlgorithm 类需用户自定义实现，详细例子 [ModuloShardingTableAlgorithm](https://github.com/geomonlin/shardingsphere-example/tree/dev/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm) ```java DataSource getShardingDataSource() throws SQLException { diff --git a/docs/document/content/manual/sharding-jdbc/configuration/config-java.en.md b/docs/document/content/manual/sharding-jdbc/configuration/config-java.en.md index fde89703c7..f36dabb8e2 100644 --- a/docs/document/content/manual/sharding-jdbc/configuration/config-java.en.md +++ b/docs/document/content/manual/sharding-jdbc/configuration/config-java.en.md @@ -5,7 +5,7 @@ weight = 1 ## Configuration Instance -The implementation of DataSource in the following configuration is [DataSourceUtil](https://github.com/geomonlin/incubator-shardingsphere-example/blob/4.0.0-RC2/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtil.java)，The ModuloShardingTableAlgorithm class needs user-defined. For a detailed example [ModuloShardingTableAlgorithm](https://github.com/geomonlin/incubator-shardingsphere-example/tree/dev/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm) +The implementation of DataSource in the following configuration is [DataSourceUtil](https://github.com/geomonlin/shardingsphere-example/blob/4.0.0-RC2/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtil.java)，The ModuloShardingTableAlgorithm class needs user-defined. For a detailed example [ModuloShardingTableAlgorithm](https://github.com/geomonlin/incubator-shardingsphere-example/tree/dev/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm) ### Data Sharding diff --git a/docs/document/content/manual/sharding-jdbc/configuration/config-spring-namespace.cn.md b/docs/document/content/manual/sharding-jdbc/configuration/config-spring-namespace.cn.md index 39642be194..7504542f8a 100644 --- a/docs/document/content/manual/sharding-jdbc/configuration/config-spring-namespace.cn.md +++ b/docs/document/content/manual/sharding-jdbc/configuration/config-spring-namespace.cn.md @@ -8,7 +8,7 @@ weight = 4 行表达式标识符可以使用`${...}`或`$->{...}`，但前者与Spring本身的属性文件占位符冲突，因此在Spring环境中使用行表达式标识符建议使用`$->{...}`。 ## 配置示例 -详细example: [shardingsphere-example](https://github.com/apache/incubator-shardingsphere-example/tree/dev/sharding-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF) +详细example: [shardingsphere-example](https://github.com/apache/shardingsphere-example/tree/dev/sharding-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF) ### 数据分片 ```xml diff --git a/docs/document/content/manual/sharding-jdbc/configuration/config-spring-namespace.en.md b/docs/document/content/manual/sharding-jdbc/configuration/config-spring-namespace.en.md index a52d34bb2b..d3da813e5f 100644 --- a/docs/document/content/manual/sharding-jdbc/configuration/config-spring-namespace.en.md +++ b/docs/document/content/manual/sharding-jdbc/configuration/config-spring-namespace.en.md @@ -8,7 +8,7 @@ weight = 4 Inline expression identifier can can use `${...} ` or `$->{...}`, but the former one clashes with the placeholder in property documents of Spring, so it is suggested to use `$->{...}` for inline expression identifier under Spring environment. ## Example -example: [shardingsphere-example](https://github.com/apache/incubator-shardingsphere-example/tree/dev/sharding-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF) +example: [shardingsphere-example](https://github.com/apache/shardingsphere-example/tree/dev/sharding-jdbc-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF) ### Sharding ```xml diff --git a/docs/document/content/manual/sharding-jdbc/usage/_index.cn.md b/docs/document/content/manual/sharding-jdbc/usage/_index.cn.md index c73bd91f0d..3377f5c183 100644 --- a/docs/document/content/manual/sharding-jdbc/usage/_index.cn.md +++ b/docs/document/content/manual/sharding-jdbc/usage/_index.cn.md @@ -7,5 +7,4 @@ chapter = true ## 导览 -本章节将介绍Sharding-JDBC相关使用。 -更多使用细节请参见[使用示例](https://github.com/sharding-sphere/sharding-sphere-example)。 +本章节将介绍Sharding-JDBC相关使用。更多使用细节请参见[使用示例](https://github.com/apache/shardingsphere-example)。 diff --git a/docs/document/content/manual/sharding-jdbc/usage/_index.en.md b/docs/document/content/manual/sharding-jdbc/usage/_index.en.md index e406f205a0..f5331a3aba 100644 --- a/docs/document/content/manual/sharding-jdbc/usage/_index.en.md +++ b/docs/document/content/manual/sharding-jdbc/usage/_index.en.md @@ -7,4 +7,4 @@ chapter = true ## Navigation -This chapter will introduce the use of Sharding-JDBC. Please refer to [Example](https://github.com/sharding-sphere/sharding-sphere-example) for more details. +This chapter will introduce the use of Sharding-JDBC. Please refer to [Example](https://github.com/apache/shardingsphere-example) for more details. diff --git a/docs/document/content/manual/sharding-jdbc/usage/hint.cn.md b/docs/document/content/manual/sharding-jdbc/usage/hint.cn.md index 48d3ab6585..80c2ae44f1 100644 --- a/docs/document/content/manual/sharding-jdbc/usage/hint.cn.md +++ b/docs/document/content/manual/sharding-jdbc/usage/hint.cn.md @@ -123,4 +123,4 @@ try ( ``` ### example -[hint-example](https://github.com/apache/incubator-shardingsphere-example/tree/4.0.0-RC2/sharding-jdbc-example/other-feature-example/hint-example) +[hint-example](https://github.com/apache/shardingsphere-example/tree/4.0.0-RC2/sharding-jdbc-example/other-feature-example/hint-example) diff --git a/docs/document/content/manual/sharding-jdbc/usage/hint.en.md b/docs/document/content/manual/sharding-jdbc/usage/hint.en.md index 015fbd04f6..526c237a21 100644 --- a/docs/document/content/manual/sharding-jdbc/usage/hint.en.md +++ b/docs/document/content/manual/sharding-jdbc/usage/hint.en.md @@ -122,4 +122,4 @@ try ( ### Example -[hint-example](https://github.com/apache/incubator-shardingsphere-example/tree/4.0.0-RC2/sharding-jdbc-example/other-feature-example/hint-example) \ No newline at end of file +[hint-example](https://github.com/apache/shardingsphere-example/tree/4.0.0-RC2/sharding-jdbc-example/other-feature-example/hint-example) \ No newline at end of file diff --git a/docs/document/content/manual/sharding-jdbc/usage/transaction.cn.md b/docs/document/content/manual/sharding-jdbc/usage/transaction.cn.md index dcbc3d09c8..b9833cd9b6 100644 --- a/docs/document/content/manual/sharding-jdbc/usage/transaction.cn.md +++ b/docs/document/content/manual/sharding-jdbc/usage/transaction.cn.md @@ -205,4 +205,4 @@ client { ## 分布式事务example -* [官方example](https://github.com/apache/incubator-shardingsphere/tree/master/examples/sharding-jdbc-example/sharding-example) +* [官方example](https://github.com/apache/shardingsphere/tree/master/examples/sharding-jdbc-example/sharding-example) diff --git a/docs/document/content/manual/sharding-jdbc/usage/transaction.en.md b/docs/document/content/manual/sharding-jdbc/usage/transaction.en.md index 4505e0883d..df241e3794 100644 --- a/docs/document/content/manual/sharding-jdbc/usage/transaction.en.md +++ b/docs/document/content/manual/sharding-jdbc/usage/transaction.en.md @@ -209,4 +209,4 @@ client { ## Distributed Transaction Example -* [official example](https://github.com/apache/incubator-shardingsphere/tree/master/examples/sharding-jdbc-example/sharding-example) \ No newline at end of file +* [official example](https://github.com/apache/shardingsphere/tree/master/examples/sharding-jdbc-example/sharding-example) \ No newline at end of file diff --git a/docs/document/content/manual/sharding-proxy/docker.cn.md b/docs/document/content/manual/sharding-proxy/docker.cn.md index 91998a7304..fde610ab30 100644 --- a/docs/document/content/manual/sharding-proxy/docker.cn.md +++ b/docs/document/content/manual/sharding-proxy/docker.cn.md @@ -13,7 +13,7 @@ docker pull apache/sharding-proxy ## 手动构建Docker镜像（可选） ``` -git clone https://github.com/apache/incubator-shardingsphere +git clone https://github.com/apache/shardingsphere mvn clean install cd sharding-sphere/sharding-distribution/sharding-proxy-distribution mvn clean package docker:build @@ -23,7 +23,7 @@ mvn clean package docker:build 在/${your_work_dir}/conf/创建server.yaml和config-xxx.yaml文件，进行服务器和分片规则配置。 配置规则，请参考[配置手册](/cn/manual/sharding-proxy/configuration/)。 -配置模板，请参考[配置模板](https://github.com/apache/incubator-shardingsphere/tree/master/sharding-proxy/sharding-proxy-bootstrap/src/main/resources/conf) +配置模板，请参考[配置模板](https://github.com/apache/shardingsphere/tree/master/sharding-proxy/sharding-proxy-bootstrap/src/main/resources/conf) ## 运行Docker diff --git a/docs/document/content/manual/sharding-proxy/docker.en.md b/docs/document/content/manual/sharding-proxy/docker.en.md index 780050139a..60c3ff42d2 100644 --- a/docs/document/content/manual/sharding-proxy/docker.en.md +++ b/docs/document/content/manual/sharding-proxy/docker.en.md @@ -13,7 +13,7 @@ docker pull apache/sharding-proxy ## Build Docker Clone Manually (Optional) ``` -git clone https://github.com/apache/incubator-shardingsphere +git clone https://github.com/apache/shardingsphere mvn clean install cd sharding-distribution/sharding-proxy-distribution mvn clean package docker:build @@ -23,7 +23,7 @@ mvn clean package docker:build Create `server.yaml` and `config-xxx.yaml` to configure sharding rules and server rule in `/${your_work_dir}/conf/`. Please refer to [Configuration Manual](/en/manual/sharding-proxy/configuration/). -Please refer to [Example](https://github.com/apache/incubator-shardingsphere/tree/master/sharding-proxy/sharding-proxy-bootstrap/src/main/resources/conf). +Please refer to [Example](https://github.com/apache/shardingsphere/tree/master/sharding-proxy/sharding-proxy-bootstrap/src/main/resources/conf). ## Run Docker diff --git a/docs/document/content/manual/sharding-scaling/build.cn.md b/docs/document/content/manual/sharding-scaling/build.cn.md index 201473a0c1..4ece2188eb 100644 --- a/docs/document/content/manual/sharding-scaling/build.cn.md +++ b/docs/document/content/manual/sharding-scaling/build.cn.md @@ -10,12 +10,12 @@ weight = 1 ``` -git clone https://github.com/apache/incubator-shardingsphere.git； -cd incubator-shardingsphere; +git clone https://github.com/apache/shardingsphere.git； +cd shardingsphere; mvn clean install -Prelease; ``` -发布包所在目录为：`/sharding-distribution/sharding-scaling-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-scaling-bin.tar.gz`。 +发布包所在目录为：`/sharding-distribution/sharding-scaling-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-scaling-bin.tar.gz`。 2. 解压缩发布包，修改配置文件`conf/server.yaml`，这里主要修改启动端口，保证不与本机其他端口冲突，其他值保持默认即可： diff --git a/docs/document/content/manual/sharding-scaling/build.en.md b/docs/document/content/manual/sharding-scaling/build.en.md index 3063af572a..c115c27948 100644 --- a/docs/document/content/manual/sharding-scaling/build.en.md +++ b/docs/document/content/manual/sharding-scaling/build.en.md @@ -9,12 +9,12 @@ weight = 1 1. Execute the following command to compile and generate the sharding-scaling binary package: ``` -git clone https://github.com/apache/incubator-shardingsphere.git； -cd incubator-shardingsphere; +git clone https://github.com/apache/shardingsphere.git； +cd shardingsphere; mvn clean install -Prelease; ``` -The binary package's directory is:`/sharding-distribution/sharding-scaling-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-scaling-bin.tar.gz`。 +The binary package's directory is:`/sharding-distribution/sharding-scaling-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-scaling-bin.tar.gz`。 2. Unzip the distribution package, modify the configuration file `conf/server.yaml`, we should ensure the port does not conflict with others, and other values can be left as default: diff --git a/docs/document/content/manual/sharding-ui/usage/build.cn.md b/docs/document/content/manual/sharding-ui/usage/build.cn.md index c151fdfb93..abe4385c67 100644 --- a/docs/document/content/manual/sharding-ui/usage/build.cn.md +++ b/docs/document/content/manual/sharding-ui/usage/build.cn.md @@ -5,9 +5,9 @@ weight = 1 ## 二进制运行 -1. `git clone https://github.com/apache/incubator-shardingsphere.git`； +1. `git clone https://github.com/apache/shardingsphere.git`； 1. 运行 `mvn clean install -Prelease`； -1. 获取安装包 `/sharding-distribution/shardingsphere-ui-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-ui-bin.tar.gz`； +1. 获取安装包 `/sharding-distribution/shardingsphere-ui-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-ui-bin.tar.gz`； 1. 解压缩后运行`bin/start.sh`； 1. 访问`http://localhost:8088/`。 diff --git a/docs/document/content/manual/sharding-ui/usage/build.en.md b/docs/document/content/manual/sharding-ui/usage/build.en.md index e404fbbd29..9edbfa6af5 100644 --- a/docs/document/content/manual/sharding-ui/usage/build.en.md +++ b/docs/document/content/manual/sharding-ui/usage/build.en.md @@ -5,9 +5,9 @@ weight = 1 ## Binary Run -1. `git clone https://github.com/apache/incubator-shardingsphere.git`; +1. `git clone https://github.com/apache/shardingsphere.git`; 1. Run `mvn clean install -Prelease`; -1. Get the package in `/sharding-distribution/shardingsphere-ui-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-ui-bin.tar.gz`; +1. Get the package in `/sharding-distribution/shardingsphere-ui-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-ui-bin.tar.gz`; 1. After the decompression, run `bin/start.sh`; 1. visit `http://localhost:8088/`. diff --git a/docs/document/content/overview/_index.cn.md b/docs/document/content/overview/_index.cn.md index 66c0779a59..9dcd61aafc 100644 --- a/docs/document/content/overview/_index.cn.md +++ b/docs/document/content/overview/_index.cn.md @@ -5,11 +5,11 @@ weight = 1 chapter = true +++ -[![GitHub release](https://img.shields.io/github/release/apache/incubator-shardingsphere.svg?style=social&label=Release)](https://github.com/apache/incubator-shardingsphere/releases)  -[![GitHub stars](https://img.shields.io/github/stars/apache/incubator-shardingsphere.svg?style=social&label=Star)](https://github.com/apache/incubator-shardingsphere/stargazers)  -[![GitHub forks](https://img.shields.io/github/forks/apache/incubator-shardingsphere.svg?style=social&label=Fork)](https://github.com/apache/incubator-shardingsphere/fork)  +[![GitHub release](https://img.shields.io/github/release/apache/shardingsphere.svg?style=social&label=Release)](https://github.com/apache/shardingsphere/releases)  +[![GitHub stars](https://img.shields.io/github/stars/apache/shardingsphere.svg?style=social&label=Star)](https://github.com/apache/shardingsphere/stargazers)  +[![GitHub forks](https://img.shields.io/github/forks/apache/shardingsphere.svg?style=social&label=Fork)](https://github.com/apache/shardingsphere/fork)  [![GitHub watchers](https://img.shields.io/github/watchers/sharding-sphere/sharding-sphere.svg?style=social&label=Watch)](https://github.com/sharding-sphere/sharding-sphere/watchers) -[![Stargazers over time](https://starchart.cc/apache/incubator-shardingsphere.svg)](https://starchart.cc/apache/incubator-shardingsphere) +[![Stargazers over time](https://starchart.cc/apache/shardingsphere.svg)](https://starchart.cc/apache/shardingsphere) ShardingSphere是一套开源的分布式数据库中间件解决方案组成的生态圈，它由Sharding-JDBC、Sharding-Proxy和Sharding-Sidecar（计划中）这3款相互独立的产品组成。 他们均提供标准化的数据分片、分布式事务和数据库治理功能，可适用于如Java同构、异构语言、云原生等各种多样化的应用场景。 @@ -18,17 +18,17 @@ ShardingSphere定位为关系型数据库中间件，旨在充分合理地在分 它与NoSQL和NewSQL是并存而非互斥的关系。NoSQL和NewSQL作为新技术探索的前沿，放眼未来，拥抱变化，是非常值得推荐的。反之，也可以用另一种思路看待问题，放眼未来，关注不变的东西，进而抓住事物本质。 关系型数据库当今依然占有巨大市场，是各个公司核心业务的基石，未来也难于撼动，我们目前阶段更加关注在原有基础上的增量，而非颠覆。 -ShardingSphere目前已经进入[Apache孵化器](http://incubator.apache.org/projects/shardingsphere.html)， -欢迎通过[shardingsphere的dev邮件列表](mailto:dev@shardingsphere.incubator.apache.org)与我们讨论。 +ShardingSphere已经在2020年4月16日从[Apache孵化器](http://incubator.apache.org/projects/shardingsphere.html)毕业，成为Apache顶级项目。 +欢迎通过[shardingsphere的dev邮件列表](mailto:dev@shardingsphere.apache.org)与我们讨论。 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Gitter](https://badges.gitter.im/shardingsphere/shardingsphere.svg)](https://gitter.im/shardingsphere/Lobby) -[![GitHub release](https://img.shields.io/github/release/apache/incubator-shardingsphere.svg)](https://github.com/apache/incubator-shardingsphere/releases) +[![GitHub release](https://img.shields.io/github/release/apache/shardingsphere.svg)](https://github.com/apache/shardingsphere/releases) -[![Total Lines](https://tokei.rs/b1/github/apache/incubator-shardingsphere?category=lines)](https://github.com/apache/incubator-shardingsphere) +[![Total Lines](https://tokei.rs/b1/github/apache/shardingsphere?category=lines)](https://github.com/apache/shardingsphere) [![Build Status](https://builds.apache.org/job/shardingsphere-ci-dev/badge/icon)](https://builds.apache.org/job/shardingsphere-ci-dev/) -[![Coverage Status](https://coveralls.io/repos/github/apache/incubator-shardingsphere/badge.svg?branch=dev)](https://coveralls.io/github/apache/incubator-shardingsphere?branch=dev) +[![Coverage Status](https://coveralls.io/repos/github/apache/shardingsphere/badge.svg?branch=dev)](https://coveralls.io/github/apache/shardingsphere?branch=dev) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/278600ed40ad48e988ab485b439abbcd)](https://www.codacy.com/app/terrymanu/sharding-sphere?utm_source=github.com&utm_medium=referral&utm_content=sharding-sphere/sharding-sphere&utm_campaign=Badge_Grade) [![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) [![Skywalking Tracing](https://img.shields.io/badge/Skywalking%20Tracing-enable-brightgreen.svg)](https://github.com/apache/skywalking) diff --git a/docs/document/content/overview/_index.en.md b/docs/document/content/overview/_index.en.md index 661f3fd079..f79c4478b4 100644 --- a/docs/document/content/overview/_index.en.md +++ b/docs/document/content/overview/_index.en.md @@ -5,11 +5,11 @@ weight = 1 chapter = true +++ -[![GitHub release](https://img.shields.io/github/release/apache/incubator-shardingsphere.svg?style=social&label=Release)](https://github.com/apache/incubator-shardingsphere/releases)  -[![GitHub stars](https://img.shields.io/github/stars/apache/incubator-shardingsphere.svg?style=social&label=Star)](https://github.com/apache/incubator-shardingsphere/stargazers)  -[![GitHub forks](https://img.shields.io/github/forks/apache/incubator-shardingsphere.svg?style=social&label=Fork)](https://github.com/apache/incubator-shardingsphere/fork)  -[![GitHub watchers](https://img.shields.io/github/watchers/apache/incubator-shardingsphere.svg?style=social&label=Watch)](https://github.com/apache/incubator-shardingsphere/watchers) -[![Stargazers over time](https://starchart.cc/apache/incubator-shardingsphere.svg)](https://starchart.cc/apache/incubator-shardingsphere) +[![GitHub release](https://img.shields.io/github/release/apache/shardingsphere.svg?style=social&label=Release)](https://github.com/apache/shardingsphere/releases)  +[![GitHub stars](https://img.shields.io/github/stars/apache/shardingsphere.svg?style=social&label=Star)](https://github.com/apache/shardingsphere/stargazers)  +[![GitHub forks](https://img.shields.io/github/forks/apache/shardingsphere.svg?style=social&label=Fork)](https://github.com/apache/shardingsphere/fork)  +[![GitHub watchers](https://img.shields.io/github/watchers/apache/shardingsphere.svg?style=social&label=Watch)](https://github.com/apache/shardingsphere/watchers) +[![Stargazers over time](https://starchart.cc/apache/shardingsphere.svg)](https://starchart.cc/apache/shardingsphere) ShardingSphere is an open-source ecosphere consists of a set of distributed database middleware solutions, including 3 independent products, Sharding-JDBC, Sharding-Proxy & Sharding-Sidecar (todo). They all provide functions of data sharding, distributed transaction and database orchestration, applicable in a variety of situations such as Java isomorphism, heterogeneous language and cloud native. @@ -17,14 +17,17 @@ Aiming at reasonably making full use of the computation and storage capacity of As the cornerstone of many enterprises, relational database still takes a huge market share. Therefore, at the current stage, we prefer to focus on its increment instead of a total overturn. +ShardingSphere had graduated from [Apache Incubator](http://incubator.apache.org/projects/shardingsphere.html) on April 16 2020, is now officially an Apache Project! +Welcome discuss with community via [shardingsphere dev mail list](mailto:dev@shardingsphere.apache.org). + [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Gitter](https://badges.gitter.im/shardingsphere/shardingsphere.svg)](https://gitter.im/shardingsphere/Lobby) -[![GitHub release](https://img.shields.io/github/release/apache/incubator-shardingsphere.svg)](https://github.com/apache/incubator-shardingsphere/releases) +[![GitHub release](https://img.shields.io/github/release/apache/shardingsphere.svg)](https://github.com/apache/shardingsphere/releases) -[![Total Lines](https://tokei.rs/b1/github/apache/incubator-shardingsphere?category=lines)](https://github.com/apache/incubator-shardingsphere) +[![Total Lines](https://tokei.rs/b1/github/apache/shardingsphere?category=lines)](https://github.com/apache/shardingsphere) [![Build Status](https://builds.apache.org/job/shardingsphere-ci-dev/badge/icon)](https://builds.apache.org/job/shardingsphere-ci-dev/) -[![Coverage Status](https://coveralls.io/repos/github/apache/incubator-shardingsphere/badge.svg?branch=dev)](https://coveralls.io/github/apache/incubator-shardingsphere?branch=dev) +[![Coverage Status](https://coveralls.io/repos/github/apache/shardingsphere/badge.svg?branch=dev)](https://coveralls.io/github/apache/shardingsphere?branch=dev) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/278600ed40ad48e988ab485b439abbcd)](https://www.codacy.com/app/terrymanu/sharding-sphere?utm_source=github.com&utm_medium=referral&utm_content=sharding-sphere/sharding-sphere&utm_campaign=Badge_Grade) [![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) [![Skywalking Tracing](https://img.shields.io/badge/Skywalking%20Tracing-enable-brightgreen.svg)](https://github.com/apache/skywalking) diff --git a/docs/document/content/quick-start/sharding-scaling-quick-start.cn.md b/docs/document/content/quick-start/sharding-scaling-quick-start.cn.md index cb9c65b8f7..680313890b 100644 --- a/docs/document/content/quick-start/sharding-scaling-quick-start.cn.md +++ b/docs/document/content/quick-start/sharding-scaling-quick-start.cn.md @@ -12,12 +12,12 @@ weight = 3 ``` -git clone https://github.com/apache/incubator-shardingsphere.git； -cd incubator-shardingsphere; +git clone https://github.com/apache/shardingsphere.git； +cd shardingsphere; mvn clean install -Prelease; ``` -发布包所在目录为：`/sharding-distribution/sharding-scaling-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-scaling-bin.tar.gz`。 +发布包所在目录为：`/sharding-distribution/sharding-scaling-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-scaling-bin.tar.gz`。 #### 2. 解压缩发布包，修改配置文件`conf/server.yaml`，这里主要修改启动端口，保证不与本机其他端口冲突，其他值保持默认即可： diff --git a/docs/document/content/quick-start/sharding-scaling-quick-start.en.md b/docs/document/content/quick-start/sharding-scaling-quick-start.en.md index 8a561d0a8d..a39281f800 100644 --- a/docs/document/content/quick-start/sharding-scaling-quick-start.en.md +++ b/docs/document/content/quick-start/sharding-scaling-quick-start.en.md @@ -11,12 +11,12 @@ weight = 3 #### 1. Execute the following command to compile and generate the sharding-scaling binary package: ``` -git clone https://github.com/apache/incubator-shardingsphere.git； -cd incubator-shardingsphere; +git clone https://github.com/apache/shardingsphere.git； +cd shardingsphere; mvn clean install -Prelease; ``` -The binary package's directory is:`/sharding-distribution/sharding-scaling-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-sharding-scaling-bin.tar.gz`。 +The binary package's directory is:`/sharding-distribution/sharding-scaling-distribution/target/apache-shardingsphere-${latest.release.version}-sharding-scaling-bin.tar.gz`。 #### 2. Unzip the distribution package, modify the configuration file `conf/server.yaml`, we should ensure the port does not conflict with others, and other values can be left as default: diff --git a/examples/README.md b/examples/README.md index 5f22ea0e32..488b850573 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,30 +1,30 @@ # ShardingSphere-example -Example for 1.x please see tags in `https://github.com/apache/incubator-shardingsphere/tree/${tag}/sharding-jdbc-example` +Example for 1.x please see tags in `https://github.com/apache/shardingsphere/tree/${tag}/sharding-jdbc-example` -Example for 2.x or 3.x or 4.x please see tags in `https://github.com/apache/incubator-shardingsphere-example/tree/${tag}` +Example for 2.x or 3.x or 4.x please see tags in `https://github.com/apache/shardingsphere-example/tree/${tag}` **Need attention** - *Please do not use `dev` branch to run your example, example of `dev` branch is not released yet.* -- *The manual schema initial script is in `https://github.com/apache/incubator-shardingsphere-example/blob/dev/src/resources/manual_schema.sql`, please execute it before you first run the example.* +- *The manual schema initial script is in `https://github.com/apache/shardingsphere-example/blob/dev/src/resources/manual_schema.sql`, please execute it before you first run the example.* - *Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.* ## Before start the example if you want use `dev` branch -Please make sure some dependencies from [shardingsphere](https://github.com/apache/incubator-shardingsphere) and [shardingsphere-spi-impl](https://github.com/OpenSharding/shardingsphere-spi-impl) have been installed since some examples depend on that. +Please make sure some dependencies from [shardingsphere](https://github.com/apache/shardingsphere) and [shardingsphere-spi-impl](https://github.com/OpenSharding/shardingsphere-spi-impl) have been installed since some examples depend on that. if you are a newbie for shardingsphere, you could prepare the dependencies as following: -1.download and install [shardingsphere](https://github.com/apache/incubator-shardingsphere): +1.download and install [shardingsphere](https://github.com/apache/shardingsphere): ```bash ## download the code of shardingsphere -git clone https://github.com/apache/incubator-shardingsphere.git +git clone https://github.com/apache/shardingsphere.git ## checkout a specific version, example is 4.0.0-RC1 -cd incubator-shardingsphere && git checkout 4.0.0-RC1 +cd shardingsphere && git checkout 4.0.0-RC1 ## install the dependencies mvn clean install -Prelease diff --git a/examples/README_ZH.md b/examples/README_ZH.md index c9ebae0f20..2957c8b918 100644 --- a/examples/README_ZH.md +++ b/examples/README_ZH.md @@ -1,29 +1,29 @@ # ShardingSphere示例 -1.x的示例，请参阅 `https://github.com/apache/incubator-shardingsphere/tree/${tag}/sharding-jdbc-example` +1.x的示例，请参阅 `https://github.com/apache/shardingsphere/tree/${tag}/sharding-jdbc-example` -2.x或3.x或4.x的示例，请参见 `https://github.com/apache/incubator-shardingsphere-example/tree/${tag}` +2.x或3.x或4.x的示例，请参见 `https://github.com/apache/shardingsphere-example/tree/${tag}` **需要注意** - *请不要使用`dev`分支来运行您的示例，`dev`分支的示例尚未发布。* -- *手动模式初始脚本位于 `https://github.com/apache/incubator-shardingsphere-example/blob/dev/src/resources/manual_schema.sql`，请在首次运行示例之前执行它。* +- *手动模式初始脚本位于 `https://github.com/apache/shardingsphere-example/blob/dev/src/resources/manual_schema.sql`，请在首次运行示例之前执行它。* - *请确保MySQL上的主从数据同步正确运行。否则，此示例查询从库数据将是空。* ## 如果要使用`dev`分支，请在开始该example之前 -请确保已安装了来自[shardingsphere](https://github.com/apache/incubator-shardingsphere) 和 [shardingsphere-spi-impl](https://github.com/OpenSharding/shardingsphere-spi-impl)的某些依赖项，因为某些示例依赖于此。如果您是shardingsphere的新手，您可以准备如下依赖： +请确保已安装了来自[shardingsphere](https://github.com/apache/shardingsphere) 和 [shardingsphere-spi-impl](https://github.com/OpenSharding/shardingsphere-spi-impl)的某些依赖项，因为某些示例依赖于此。如果您是shardingsphere的新手，您可以准备如下依赖： -1.下载并安装[shardingsphere](https://github.com/apache/incubator-shardingsphere)： +1.下载并安装[shardingsphere](https://github.com/apache/shardingsphere)： ```bash ## 下载shardingsphere代码 -git clone https://github.com/apache/incubator-shardingsphere.git +git clone https://github.com/apache/shardingsphere.git ## 检出一个指定版本，比如是 4.0.0-RC1 -cd incubator-shardingsphere && git checkout 4.0.0-RC1 +cd shardingsphere && git checkout 4.0.0-RC1 ## 安装依赖 mvn clean install -Prelease diff --git a/pom.xml b/pom.xml index 4ab7b5ef95..859c126772 100644 --- a/pom.xml +++ b/pom.xml @@ -497,7 +497,7 @@ - apache-shardingsphere-incubating-${project.version} + apache-shardingsphere-${project.version} kr.motd.maven @@ -925,18 +925,18 @@ - scm:git:https://github.com/apache/incubator-shardingsphere.git - scm:git:https://github.com/apache/incubator-shardingsphere.git - https://github.com/apache/incubator-shardingsphere.git + scm:git:https://github.com/apache/shardingsphere.git + scm:git:https://github.com/apache/shardingsphere.git + https://github.com/apache/shardingsphere.git HEAD ShardingSphere Developer List - dev@shardingsphere.incubator.apache.org - dev-subscribe@shardingsphere.incubator.apache.org - dev-unsubscribe@shardingsphere.incubator.apache.org + dev@shardingsphere.apache.org + dev-subscribe@shardingsphere.apache.org + dev-unsubscribe@shardingsphere.apache.org diff --git a/shardingsphere-ui/DISCLAIMER b/shardingsphere-ui/DISCLAIMER deleted file mode 100644 index cf7b29dc7d..0000000000 --- a/shardingsphere-ui/DISCLAIMER +++ /dev/null @@ -1,5 +0,0 @@ -Apache ShardingSphere (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/shardingsphere-ui/NOTICE b/shardingsphere-ui/NOTICE index f700ec4cfc..0e79da7be6 100644 --- a/shardingsphere-ui/NOTICE +++ b/shardingsphere-ui/NOTICE @@ -1,4 +1,4 @@ -Apache ShardingSphere (incubating) +Apache ShardingSphere Copyright 2018-2020 The Apache Software Foundation This product includes software developed at diff --git a/shardingsphere-ui/README.md b/shardingsphere-ui/README.md index c2efe56044..95d3c7ea67 100644 --- a/shardingsphere-ui/README.md +++ b/shardingsphere-ui/README.md @@ -20,9 +20,9 @@ shardingsphere-ui-backend is a standard spring boot project. ## How to Build ```bash -git clone https://github.com/apache/incubator-shardingsphere.git -cd incubator-shardingsphere/shardingsphere-ui/ +git clone https://github.com/apache/shardingsphere.git +cd shardingsphere/shardingsphere-ui/ mvn clean package -Prelease ``` -Get the package in `shardingsphere-ui/shardingsphere-ui-distribution/shardingsphere-ui-bin-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-shardingsphere-ui-bin.tar.gz` +Get the package in `shardingsphere-ui/shardingsphere-ui-distribution/shardingsphere-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-ui-bin.tar.gz` diff --git a/shardingsphere-ui/README_ZH.md b/shardingsphere-ui/README_ZH.md index 3bda5f976b..978e1b598f 100644 --- a/shardingsphere-ui/README_ZH.md +++ b/shardingsphere-ui/README_ZH.md @@ -20,10 +20,10 @@ shardingsphere-ui-backend模块是一个标准的spring boot项目。 ## 如何构建 ```bash -git clone https://github.com/apache/incubator-shardingsphere.git -cd incubator-shardingsphere/shardingsphere-ui/ +git clone https://github.com/apache/shardingsphere.git +cd shardingsphere/shardingsphere-ui/ mvn clean package -Prelease ``` -从 `shardingsphere-ui/shardingsphere-ui-distribution/shardingsphere-ui-bin-distribution/target/apache-shardingsphere-incubating-${latest.release.version}-shardingsphere-ui-bin.tar.gz`中获取软件包。 +从 `shardingsphere-ui/shardingsphere-ui-distribution/shardingsphere-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-ui-bin.tar.gz`中获取软件包。 -- GitLab