提交 c654e1c8 编写于 作者: T tuohai666

Merge branch 'dev-4.x' of https://github.com/apache/incubator-shardingsphere into dev-4.x

......@@ -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.
......
......@@ -3,8 +3,8 @@ You can report a bug, submit a new feature enhancement recommendation, or commit
## Reporting Bugs
- Before report a bug, please search from google to confirm you cannot find any hint on it.
- Look [issues List](https://github.com/sharding-sphere/sharding-sphere/issues) to confirm this issue is not a duplicated one.
- [Create](https://github.com/sharding-sphere/sharding-sphere/issues/new) a new issue.
- Look [issues List](https://github.com/apache/shardingsphere/issues) to confirm this issue is not a duplicated one.
- [Create](https://github.com/apache/shardingsphere/issues/new) a new issue.
- Define a clear and descriptive title for the issue.
- If bug reported, please provide information below:
- Details for reproduce bug step by step. Include SQL, configuration, expected results, actual results and tracing log.
......
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 (incubating)
Apache ShardingSphere
Copyright 2018-2020 The Apache Software Foundation
This product includes software developed at
......
......@@ -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)
......@@ -130,9 +130,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 +145,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
......
......@@ -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)
......@@ -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的二进制包
```
## 全景图
......
# 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
......
# 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
......
......@@ -497,7 +497,7 @@
</dependencies>
<build>
<finalName>apache-shardingsphere-incubating-${project.version}</finalName>
<finalName>apache-shardingsphere-${project.version}</finalName>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
......@@ -925,18 +925,18 @@
</licenses>
<scm>
<connection>scm:git:https://github.com/apache/incubator-shardingsphere.git</connection>
<developerConnection>scm:git:https://github.com/apache/incubator-shardingsphere.git</developerConnection>
<url>https://github.com/apache/incubator-shardingsphere.git</url>
<connection>scm:git:https://github.com/apache/shardingsphere.git</connection>
<developerConnection>scm:git:https://github.com/apache/shardingsphere.git</developerConnection>
<url>https://github.com/apache/shardingsphere.git</url>
<tag>HEAD</tag>
</scm>
<mailingLists>
<mailingList>
<name>ShardingSphere Developer List</name>
<post>dev@shardingsphere.incubator.apache.org</post>
<subscribe>dev-subscribe@shardingsphere.incubator.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@shardingsphere.incubator.apache.org</unsubscribe>
<post>dev@shardingsphere.apache.org</post>
<subscribe>dev-subscribe@shardingsphere.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@shardingsphere.apache.org</unsubscribe>
</mailingList>
</mailingLists>
</project>
......@@ -27,7 +27,7 @@ We welcome contributions of all kinds, for details of how you can help
https://shardingsphere.apache.org/community/en/contribute/
Find the issue tracker from here
https://github.com/apache/incubator-shardingsphere/issues
https://github.com/apache/shardingsphere/issues
Please help us make Apache ShardingSphere better - we appreciate any feedback you may have.
......
......@@ -16,14 +16,14 @@
#
FROM java:8
MAINTAINER ShardingSphere "dev@shardingsphere.incubator.apache.org"
MAINTAINER ShardingSphere "dev@shardingsphere.apache.org"
ENV CURRENT_VERSION 5.0.0-RC1
ENV APP_NAME apache-shardingsphere-incubating
ENV APP_NAME apache-shardingsphere
ENV MODULE_NAME sharding-proxy
ENV LOCAL_PATH /opt/sharding-proxy
RUN wget https://dist.apache.org/repos/dist/release/incubator/shardingsphere/${CURRENT_VERSION}/${APP_NAME}-${CURRENT_VERSION}-${MODULE_NAME}-bin.tar.gz && \
RUN wget https://dist.apache.org/repos/dist/release/shardingsphere/${CURRENT_VERSION}/${APP_NAME}-${CURRENT_VERSION}-${MODULE_NAME}-bin.tar.gz && \
tar -xzvf ${APP_NAME}-${CURRENT_VERSION}-${MODULE_NAME}-bin.tar.gz && \
mv ${APP_NAME}-${CURRENT_VERSION}-${MODULE_NAME}-bin ${LOCAL_PATH} && \
rm -f ${APP_NAME}-${CURRENT_VERSION}-${MODULE_NAME}-bin.tar.gz
......
Apache ShardingSphere (incubating)
Apache ShardingSphere
Copyright 2018-2020 The Apache Software Foundation
This product includes software developed at
......
......@@ -25,7 +25,7 @@ We welcome contributions of all kinds, for details of how you can help
https://shardingsphere.apache.org/community/en/contribute/
Find the issue tracker from here
https://github.com/apache/incubator-shardingsphere/issues
https://github.com/apache/shardingsphere/issues
Please help us make Apache ShardingSphere better - we appreciate any feedback you may have.
......
Apache ShardingSphere (incubating)
Apache ShardingSphere
Copyright 2018-2020 The Apache Software Foundation
This product includes software developed at
......
......@@ -24,7 +24,7 @@ We welcome contributions of all kinds, for details of how you can help
https://shardingsphere.apache.org/community/en/contribute/
Find the issue tracker from here
https://github.com/apache/incubator-shardingsphere/issues
https://github.com/apache/shardingsphere/issues
Please help us make Apache ShardingSphere better - we appreciate any feedback you may have.
......
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 (incubating)
Apache ShardingSphere
Copyright 2018-2020 The Apache Software Foundation
This product includes software developed at
......
......@@ -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`
......@@ -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`中获取软件包。
......@@ -61,7 +61,7 @@
</dependencyManagement>
<build>
<finalName>apache-shardingsphere-incubating-${project.version}</finalName>
<finalName>apache-shardingsphere-${project.version}</finalName>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
......
Apache ShardingSphere (incubating)
Apache ShardingSphere
Copyright 2018-2020 The Apache Software Foundation
This product includes software developed at
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册