From 32e0beff12e4e2e5530ab4ec64727d23affd8241 Mon Sep 17 00:00:00 2001 From: yukon Date: Mon, 9 Oct 2017 17:34:03 +0800 Subject: [PATCH] [ROCKETMQ-302] TLP clean up, removes incubating related info from code base --- .travis.yml | 2 +- CONTRIBUTING.md | 2 +- DISCLAIMER | 1 - NOTICE | 2 +- PULL_REQUEST_TEMPLATE.md | 2 +- .../rocketmq/client/consumer/DefaultMQPushConsumer.java | 2 +- .../apache/rocketmq/client/producer/DefaultMQProducer.java | 2 +- dev/merge_rocketmq_pr.py | 4 ++-- distribution/NOTICE-BIN | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 DISCLAIMER diff --git a/.travis.yml b/.travis.yml index daa88a2c..8f65c72f 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 50431923..b7b13347 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 cf4d0444..00000000 --- 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 53848573..c218b260 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 index f511ba5d..5d13fff3 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -15,6 +15,6 @@ Follow this checklist to help us incorporate your contribution quickly and easil - [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/incubator-rocketmq/tree/master/test). +- [ ] 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/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java b/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java index 42ce2f9c..e32edc94 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 d48686e3..30185540 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/dev/merge_rocketmq_pr.py b/dev/merge_rocketmq_pr.py index afc597a6..849b0da2 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 73589d47..c91dc225 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 -- GitLab