diff --git a/.travis.yml b/.travis.yml index daa88a2caf..8f65c72f7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ notifications: email: recipients: - - dev@rocketmq.incubator.apache.org + - dev@rocketmq.apache.org on_success: change on_failure: always diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5043192356..b7b133472c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index cf4d044461..0000000000 --- a/DISCLAIMER +++ /dev/null @@ -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. diff --git a/NOTICE b/NOTICE index 5384857326..c218b26089 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Apache RocketMQ (incubating) +Apache RocketMQ Copyright 2016-2017 The Apache Software Foundation This product includes software developed at diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..5d13fff385 --- /dev/null +++ b/PULL_REQUEST_TEMPLATE.md @@ -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). diff --git a/README.md b/README.md index a27ba7b3cf..8f37eb1e6a 100644 --- a/README.md +++ b/README.md @@ -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: -* Home: -* Docs: +* Mailing Lists: +* Home: +* Docs: * Issues: * Ask: @@ -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) ---------- diff --git a/broker/pom.xml b/broker/pom.xml index fd1e691489..e81ee030d0 100644 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index c7ab885b43..2f3fb133a6 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java b/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java index 42ce2f9c0c..e32edc9498 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java @@ -66,7 +66,7 @@ public class DefaultMQPushConsumer extends ClientConfig implements MQPushConsume * load balance. It's required and needs to be globally unique. *

* - * See here for further discussion. + * See here for further discussion. */ private String consumerGroup; diff --git a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java index d48686e337..301855401f 100644 --- a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java +++ b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java @@ -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. *

* - * 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; diff --git a/common/pom.xml b/common/pom.xml index 56b5d448e6..78e5ffdf7f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/dev/merge_rocketmq_pr.py b/dev/merge_rocketmq_pr.py index afc597a6f4..849b0da2af 100644 --- a/dev/merge_rocketmq_pr.py +++ b/dev/merge_rocketmq_pr.py @@ -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 diff --git a/distribution/NOTICE-BIN b/distribution/NOTICE-BIN index 73589d4766..c91dc225fb 100644 --- a/distribution/NOTICE-BIN +++ b/distribution/NOTICE-BIN @@ -1,4 +1,4 @@ -Apache RocketMQ (incubating) +Apache RocketMQ Copyright 2016-2017 The Apache Software Foundation This product includes software developed at diff --git a/distribution/pom.xml b/distribution/pom.xml index 9839b15d2d..56a5a08b55 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -20,7 +20,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT rocketmq-distribution rocketmq-distribution ${project.version} diff --git a/example/pom.xml b/example/pom.xml index ccebc4608d..7e4fd9fa0b 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 @@ -51,7 +51,7 @@ org.apache.rocketmq rocketmq-openmessaging - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/filter/pom.xml b/filter/pom.xml index f0a18e3244..a0a9e2ec97 100644 --- a/filter/pom.xml +++ b/filter/pom.xml @@ -20,7 +20,7 @@ rocketmq-all org.apache.rocketmq - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/filtersrv/pom.xml b/filtersrv/pom.xml index 2fc3e07547..667561a435 100644 --- a/filtersrv/pom.xml +++ b/filtersrv/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/logappender/pom.xml b/logappender/pom.xml index b75f25e915..d5172e6d71 100644 --- a/logappender/pom.xml +++ b/logappender/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 rocketmq-logappender diff --git a/namesrv/pom.xml b/namesrv/pom.xml index 253135fcb6..d4c2461dcb 100644 --- a/namesrv/pom.xml +++ b/namesrv/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/openmessaging/pom.xml b/openmessaging/pom.xml index ec59b876c0..e2864ebca0 100644 --- a/openmessaging/pom.xml +++ b/openmessaging/pom.xml @@ -20,7 +20,7 @@ rocketmq-all org.apache.rocketmq - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 1a03f92d65..ab90868e9e 100644 --- a/pom.xml +++ b/pom.xml @@ -29,41 +29,40 @@ 2012 org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT pom Apache RocketMQ ${project.version} - http://rocketmq.incubator.apache.org/ + http://rocketmq.apache.org/ 3.2.5 - https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git - scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git - scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rocketmq.git - + https://github.com/apache/rocketmq.git + scm:git:https://github.com/apache/rocketmq.git + scm:git:https://github.com/apache/rocketmq.git HEAD Development List - dev-subscribe@rocketmq.incubator.apache.org - dev-unsubscribe@rocketmq.incubator.apache.org - dev@rocketmq.incubator.apache.org + dev-subscribe@rocketmq.apache.org + dev-unsubscribe@rocketmq.apache.org + dev@rocketmq.apache.org User List - users-subscribe@rocketmq.incubator.apache.org - users-unsubscribe@rocketmq.incubator.apache.org - users@rocketmq.incubator.apache.org + users-subscribe@rocketmq.apache.org + users-unsubscribe@rocketmq.apache.org + users@rocketmq.apache.org Commits List - commits-subscribe@rocketmq.incubator.apache.org - commits-unsubscribe@rocketmq.incubator.apache.org - commits@rocketmq.incubator.apache.org + commits-subscribe@rocketmq.apache.org + commits-unsubscribe@rocketmq.apache.org + commits@rocketmq.apache.org @@ -253,6 +252,7 @@ .travis.yml CONTRIBUTING.md bin/README.md + PULL_REQUEST_TEMPLATE.md diff --git a/remoting/pom.xml b/remoting/pom.xml index df207cfff9..05b4274d67 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/srvutil/pom.xml b/srvutil/pom.xml index 57b4085db5..70a19a6cd8 100644 --- a/srvutil/pom.xml +++ b/srvutil/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/store/pom.xml b/store/pom.xml index e0256b1557..dd035ea572 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/test/pom.xml b/test/pom.xml index 49f376105e..5d9fe8ea5b 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -20,7 +20,7 @@ rocketmq-all org.apache.rocketmq - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/tools/pom.xml b/tools/pom.xml index 439cb680c2..a986bc696c 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -19,7 +19,7 @@ org.apache.rocketmq rocketmq-all - 4.2.0-incubating-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0