diff --git a/.travis.yml b/.travis.yml index daa88a2caf42d6dc56fe629b688ecbad315aa184..8f65c72f7d0717ec597b59cf48cc2aa45b458029 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 504319235689b20605fdc7c16016e355aa6f12ca..b7b133472c46a8b00b57230e9f21735667086b99 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 cf4d04446137d2e7ac7c9eb81cc3842e503cdccd..0000000000000000000000000000000000000000 --- 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 5384857326220c870a0da009be90c88d4e6ca00e..c218b26089b80d9c7e7856c627f00a7bb5f5d025 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 0000000000000000000000000000000000000000..5d13fff385265518a1b1b5ab5b946eabfc9fdcf9 --- /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 a27ba7b3cf3a7b825b6dbc5e8f690f6e928155f9..8f37eb1e6a9ebb4a29c113e0e6fc2ffeef12f944 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 fd1e691489fc156391804ad8387e5d49058b9104..e81ee030d04cb83edb4f540fe2c148023f3f1550 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 c7ab885b4315a51bad8e26545e08efb4958c3188..2f3fb133a669644098f025114e0773a2ab9f595e 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 42ce2f9c0c15306a4896930f7399efc940b3ac11..e32edc9498011e2c62095b84db6583bc08137f60 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 d48686e3379507cc78f3608c7e08d08d38bc426a..301855401f5150525c5b041f6a12a82ee724efb4 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 56b5d448e6dbc37836cf711dbb2f53520f4157bc..78e5ffdf7f6efe49db2088ecf02fe36a425e6073 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 afc597a6f4e793736c8c6f0d19a1b3c100e5ef09..849b0da2afe24a7223336016d7e3b10cbeee719b 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 73589d47664afbdce20f76d1e5496e40f74ff073..c91dc225fb2aacaefb00362b36a6413fbb0a4d17 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 9839b15d2d478beac745b7ae3be030668486a231..56a5a08b550665f593796c150409b5d271269ed5 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 ccebc4608dcef3cf5edf9e29d60543dd748f7b78..7e4fd9fa0bd96c8f68f0e4de26db9cd4551f9d06 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 f0a18e32447793693cf66f2da24bb2dc138a6340..a0a9e2ec9792a743a38dce939bd4ea1245fb7754 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 2fc3e07547c88f80d2f29d175bd7b5476d1fc7f1..667561a4355e77c3ed0d811153efadf42ffe22bc 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 b75f25e915ee181819bf8dcc74a4ca374428fcfe..d5172e6d718a4fbcfe42679a54330a8f0329436c 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 253135fcb6c92e7084e86680c0486be78024ca3a..d4c2461dcbf50c54e81d47c377959c1d3cab7702 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 ec59b876c09b5255d8a7bdd579498301e1b03141..e2864ebca013b8cbf1f310169524a860614bb111 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 1a03f92d6542be105a88e6204f1185bd4f6090b5..ab90868e9e8e143800751178609e43e0e1affd3f 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 df207cfff9b550a930c345010df3a7d76fe56ffe..05b4274d67447664124c81454be265fdf081dbbd 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 57b4085db5ad74e739ed56d8247795a3a51eea94..70a19a6cd8e263450b40c1310ef764d18d9869f0 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 e0256b1557227332d0cd1db776aee8eb59e3764d..dd035ea572d979df5a7ad689e20894cdb3ce7a2f 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 49f376105e17231dc1c397d7b3a1f3c527f054f9..5d9fe8ea5b3f6135fa86514faada447916d2eeba 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 439cb680c29c7fa04db7ae0324c276257e8d6906..a986bc696c148ce1479ec155defb3c01b6e19bb4 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