opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-09-01 15:47:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

TLP clean up, merge branch 'master' into develop

Browse Source
This commit is contained in:
yukon
2017-10-09 17:42:07 +08:00
parent c7def6fed4 3a0451b286
commit e8900a82cf
26 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -1,7 +1,7 @@
notifications:
email:
recipients:
- dev@rocketmq.incubator.apache.org
- dev@rocketmq.apache.org
on_success: change
on_failure: always
CONTRIBUTING.md
+1 -1
View File
@@ -1,7 +1,7 @@
## How To Contribute
We are always very happy to have contributions, whether for trivial cleanups or big new features.
We want to have high quality, well documented codes for each programming language, as well as the surrounding [ecosystem](https://github.com/apache/incubator-rocketmq-externals) of integration tools that people use with RocketMQ.
We want to have high quality, well documented codes for each programming language, as well as the surrounding [ecosystem](https://github.com/apache/rocketmq-externals) of integration tools that people use with RocketMQ.
Nor is code the only way to contribute to the project. We strongly value documentation, integration with other project, and gladly accept improvements for these aspects.
DISCLAIMER
-1
View File
@@ -1 +0,0 @@
Apache RocketMQ is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. 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.
NOTICE
+1 -1
View File
@@ -1,4 +1,4 @@
Apache RocketMQ (incubating)
Apache RocketMQ
Copyright 2016-2017 The Apache Software Foundation
This product includes software developed at
PULL_REQUEST_TEMPLATE.md
+20
View File
@@ -0,0 +1,20 @@
## What is the purpose of the change
XXXXX
## Brief changelog
XX
## Verifying this change
XXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/projects/ROCKETMQ/issues/) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
- [ ] Format the pull request title like `[ROCKETMQ-XXX] Fix UnknownException when host config not exist`. Each commit in the pull request should have a meaningful subject line and body.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in [test module](https://github.com/apache/rocketmq/tree/master/test).
- [ ] Run `mvn -B clean apache-rat:check findbugs:findbugs checkstyle:checkstyle` to make sure basic checks pass. Run `mvn clean install -DskipITs` to make sure unit-test pass. Run `mvn clean test-compile failsafe:integration-test` to make sure integration-test pass.
- [ ] If this contribution is large, please file an [Apache Individual Contributor License Agreement](http://www.apache.org/licenses/#clas).
README.md
+6 -6
View File
@@ -1,9 +1,9 @@
## Apache RocketMQ [![Build Status](https://travis-ci.org/apache/incubator-rocketmq.svg?branch=master)](https://travis-ci.org/apache/incubator-rocketmq) [![Coverage Status](https://coveralls.io/repos/github/apache/incubator-rocketmq/badge.svg?branch=master)](https://coveralls.io/github/apache/incubator-rocketmq?branch=master)
## Apache RocketMQ [![Build Status](https://travis-ci.org/apache/rocketmq.svg?branch=master)](https://travis-ci.org/apache/rocketmq) [![Coverage Status](https://coveralls.io/repos/github/apache/rocketmq/badge.svg?branch=master)](https://coveralls.io/github/apache/rocketmq?branch=master)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.rocketmq/rocketmq-all/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Corg.apache.rocketmq)
[![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://rocketmq.apache.org/dowloading/releases)
[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
**[Apache RocketMQ](https://rocketmq.incubator.apache.org) is a distributed messaging and streaming platform with low latency, high performance and reliability, trillion-level capacity and flexible scalability.**
**[Apache RocketMQ](https://rocketmq.apache.org) is a distributed messaging and streaming platform with low latency, high performance and reliability, trillion-level capacity and flexible scalability.**
It offers a variety of features:
@@ -26,9 +26,9 @@ It offers a variety of features:
----------
## Learn it & Contact us
* Mailing Lists: <https://rocketmq.incubator.apache.org/about/contact/>
* Home: <https://rocketmq.incubator.apache.org>
* Docs: <https://rocketmq.incubator.apache.org/docs/quick-start/>
* Mailing Lists: <https://rocketmq.apache.org/about/contact/>
* Home: <https://rocketmq.apache.org>
* Docs: <https://rocketmq.apache.org/docs/quick-start/>
* Issues: <https://issues.apache.org/jira/browse/RocketMQ>
* Ask: <https://stackoverflow.com/questions/tagged/rocketmq>
@@ -36,7 +36,7 @@ It offers a variety of features:
----------
## Apache RocketMQ Community
* [RocketMQ Community Projects](https://github.com/apache/incubator-rocketmq-externals)
* [RocketMQ Community Projects](https://github.com/apache/rocketmq-externals)
----------
broker/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
client/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class DefaultMQPushConsumer extends ClientConfig implements MQPushConsume
* load balance. It's required and needs to be globally unique.
* </p>
*
* See <a href="http://rocketmq.incubator.apache.org/docs/core-concept/">here</a> for further discussion.
* See <a href="http://rocketmq.apache.org/docs/core-concept/">here</a> for further discussion.
*/
private String consumerGroup;
client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class DefaultMQProducer extends ClientConfig implements MQProducer {
* For non-transactional messages, it does not matter as long as it's unique per process.
* </p>
*
* See {@linktourl http://rocketmq.incubator.apache.org/docs/core-concept/} for more discussion.
* See {@linktourl http://rocketmq.apache.org/docs/core-concept/} for more discussion.
*/
private String producerGroup;
common/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
dev/merge_rocketmq_pr.py
+2 -2
View File
@@ -57,8 +57,8 @@ JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "")
GITHUB_OAUTH_KEY = os.environ.get("GITHUB_OAUTH_KEY")
GITHUB_BASE = "https://github.com/apache/incubator-rocketmq/pull"
GITHUB_API_BASE = "https://api.github.com/repos/apache/incubator-rocketmq"
GITHUB_BASE = "https://github.com/apache/rocketmq/pull"
GITHUB_API_BASE = "https://api.github.com/repos/apache/rocketmq"
JIRA_BASE = "https://issues.apache.org/jira/browse"
JIRA_API_BASE = "https://issues.apache.org/jira"
# Prefix added to temporary branches
distribution/NOTICE-BIN
+1 -1
View File
@@ -1,4 +1,4 @@
Apache RocketMQ (incubating)
Apache RocketMQ
Copyright 2016-2017 The Apache Software Foundation
This product includes software developed at
distribution/pom.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>rocketmq-distribution</artifactId>
<name>rocketmq-distribution ${project.version}</name>
example/pom.xml
+2 -2
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-openmessaging</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
filter/pom.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<parent>
<artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
filtersrv/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
logappender/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rocketmq-logappender</artifactId>
namesrv/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
openmessaging/pom.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<parent>
<artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pom.xml
+15 -15
View File
@@ -29,41 +29,40 @@
<inceptionYear>2012</inceptionYear>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache RocketMQ ${project.version}</name>
<url>http://rocketmq.incubator.apache.org/</url>
<url>http://rocketmq.apache.org/</url>
<prerequisites>
<maven>3.2.5</maven>
</prerequisites>
<scm>
<url>https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git</url>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git
</developerConnection>
<url>https://github.com/apache/rocketmq.git</url>
<connection>scm:git:https://github.com/apache/rocketmq.git</connection>
<developerConnection>scm:git:https://github.com/apache/rocketmq.git</developerConnection>
<tag>HEAD</tag>
</scm>
<mailingLists>
<mailingList>
<name>Development List</name>
<subscribe>dev-subscribe@rocketmq.incubator.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@rocketmq.incubator.apache.org</unsubscribe>
<post>dev@rocketmq.incubator.apache.org</post>
<subscribe>dev-subscribe@rocketmq.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@rocketmq.apache.org</unsubscribe>
<post>dev@rocketmq.apache.org</post>
</mailingList>
<mailingList>
<name>User List</name>
<subscribe>users-subscribe@rocketmq.incubator.apache.org</subscribe>
<unsubscribe>users-unsubscribe@rocketmq.incubator.apache.org</unsubscribe>
<post>users@rocketmq.incubator.apache.org</post>
<subscribe>users-subscribe@rocketmq.apache.org</subscribe>
<unsubscribe>users-unsubscribe@rocketmq.apache.org</unsubscribe>
<post>users@rocketmq.apache.org</post>
</mailingList>
<mailingList>
<name>Commits List</name>
<subscribe>commits-subscribe@rocketmq.incubator.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@rocketmq.incubator.apache.org</unsubscribe>
<post>commits@rocketmq.incubator.apache.org</post>
<subscribe>commits-subscribe@rocketmq.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@rocketmq.apache.org</unsubscribe>
<post>commits@rocketmq.apache.org</post>
</mailingList>
</mailingLists>
@@ -253,6 +252,7 @@
<exclude>.travis.yml</exclude>
<exclude>CONTRIBUTING.md</exclude>
<exclude>bin/README.md</exclude>
<exclude>PULL_REQUEST_TEMPLATE.md</exclude>
</excludes>
</configuration>
</plugin>
remoting/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
srvutil/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
store/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
test/pom.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<parent>
<artifactId>rocketmq-all</artifactId>
<groupId>org.apache.rocketmq</groupId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
tools/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.2.0-incubating-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>