From 56106305eb0f1d3c23369aac8339a7befad50922 Mon Sep 17 00:00:00 2001 From: Liu Ziming <32130965+123liuziming@users.noreply.github.com> Date: Fri, 13 May 2022 10:12:53 +0800 Subject: [PATCH 1/6] [ISSUE #4284] Add protocols to readme and delete the description of language clients (#4285) * Update .travis.yml Depracated MODERATE noisy mail for dev@rocketmq.apache.org. Still Failing: apache/rocketmq#5670 (5.0.0-alpha-static-topic - 5ebc327) @dongeforever * Update README.md Co-authored-by: von gosling --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index c780bdaf55..aebac42811 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ It offers a variety of features: * Messaging patterns including publish/subscribe, request/reply and streaming * Financial grade transactional message * Built-in fault tolerance and high availability configuration options base on [DLedger](https://github.com/openmessaging/openmessaging-storage-dledger) -* A variety of cross language clients, such as Java, [C/C++](https://github.com/apache/rocketmq-client-cpp), [Python](https://github.com/apache/rocketmq-client-python), [Go](https://github.com/apache/rocketmq-client-go), [Node.js](https://github.com/apache/rocketmq-client-nodejs) * Pluggable transport protocols, such as TCP, SSL, AIO * Built-in message tracing capability, also support opentracing * Versatile big-data and streaming ecosystem integration @@ -23,7 +22,7 @@ It offers a variety of features: * Reliable FIFO and strict ordered messaging in the same queue * Efficient pull and push consumption model * Million-level message accumulation capacity in a single queue -* Multiple messaging protocols like JMS and OpenMessaging +* Multiple messaging protocols like gRPC, MQTT, JMS and OpenMessaging * Flexible distributed scale-out deployment architecture * Lightning-fast batch message exchange system * Various message filter mechanics such as SQL and Tag From e0643ed219780d1cca494914843e4b9cb982e39d Mon Sep 17 00:00:00 2001 From: logicalee <49832248+logicalee@users.noreply.github.com> Date: Fri, 13 May 2022 10:13:49 +0800 Subject: [PATCH 2/6] [ISSUE #4286] add link of rocketmq-site to readme (#4288) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aebac42811..51a6bfad7a 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ It offers a variety of features: * [RocketMQ Connect](https://github.com/apache/rocketmq-connect) * [RocketMQ MQTT](https://github.com/apache/rocketmq-mqtt) * [RocketMQ Incubating Community Projects](https://github.com/apache/rocketmq-externals) - +* [rocketmq-site](https://github.com/apache/rocketmq-site) ---------- ## Learn it & Contact us * Mailing Lists: From e52028ae1d4d25f507feaa452cc322f157680e08 Mon Sep 17 00:00:00 2001 From: hyl-xidian <38824849+hyl-xidian@users.noreply.github.com> Date: Fri, 13 May 2022 10:14:31 +0800 Subject: [PATCH 3/6] [ISSUE #4291] Add some description text to README (#4294) Add a description of RocketMQ Dashboard and RocketMQ Connect --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 51a6bfad7a..a7189c61cd 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,8 @@ It offers a variety of features: * [RocketMQ Exporter](https://github.com/apache/rocketmq-exporter) * [RocketMQ Operator](https://github.com/apache/rocketmq-operator) * [RocketMQ Docker](https://github.com/apache/rocketmq-docker) -* [RocketMQ Dashboard](https://github.com/apache/rocketmq-dashboard) -* [RocketMQ Connect](https://github.com/apache/rocketmq-connect) +* [RocketMQ Dashboard](https://github.com/apache/rocketmq-dashboard): Operation and maintenance console of RocketMQ +* [RocketMQ Connect](https://github.com/apache/rocketmq-connect): A tool for scalably and reliably streaming data between Apache RocketMQ and other systems * [RocketMQ MQTT](https://github.com/apache/rocketmq-mqtt) * [RocketMQ Incubating Community Projects](https://github.com/apache/rocketmq-externals) * [rocketmq-site](https://github.com/apache/rocketmq-site) From b2cfcac87051a869197db04dbcc160e1e4b90a49 Mon Sep 17 00:00:00 2001 From: doubleSix Date: Fri, 13 May 2022 10:16:50 +0800 Subject: [PATCH 4/6] Fix 4283 and add an description in readme. (#4293) * test * reset the test * fix 4283 fix issue 4283. * Update README.md * fix 4283 Add a description about RocketMQ streams and RocketMQ Flik. --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a7189c61cd..f8ffef31cf 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ **[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: * Messaging patterns including publish/subscribe, request/reply and streaming @@ -34,8 +35,8 @@ It offers a variety of features: ---------- ## Apache RocketMQ Community -* [RocketMQ Streams](https://github.com/apache/rocketmq-streams) -* [RocketMQ Flink](https://github.com/apache/rocketmq-flink) +* [RocketMQ Streams](https://github.com/apache/rocketmq-streams): A lightweight stream computing engine based on RocketMQ. +* [RocketMQ Flink](https://github.com/apache/rocketmq-flink): The RocketMQ connector of Flink that supports source and sink connector in data stream and Table. * [RocketMQ Client CPP](https://github.com/apache/rocketmq-client-cpp) * [RocketMQ Client Go](https://github.com/apache/rocketmq-client-go) * [RocketMQ Client Python](https://github.com/apache/rocketmq-client-python) From eb0a0e94e62d843519b61307c2d880c40b34390d Mon Sep 17 00:00:00 2001 From: Jacob_Mr_Yang <52888088+Jacob-Mr-Yang@users.noreply.github.com> Date: Fri, 13 May 2022 10:17:37 +0800 Subject: [PATCH 5/6] fix: delete a feature in Readme (#4298) Co-authored-by: Heng Du --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index f8ffef31cf..5f189d8527 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ It offers a variety of features: * Messaging patterns including publish/subscribe, request/reply and streaming * Financial grade transactional message * Built-in fault tolerance and high availability configuration options base on [DLedger](https://github.com/openmessaging/openmessaging-storage-dledger) -* Pluggable transport protocols, such as TCP, SSL, AIO * Built-in message tracing capability, also support opentracing * Versatile big-data and streaming ecosystem integration * Message retroactivity by time or offset From 9445b788757c437a0cb85964f81f9ab4af9ef90f Mon Sep 17 00:00:00 2001 From: caigy Date: Fri, 13 May 2022 16:14:42 +0800 Subject: [PATCH 6/6] [ISSUE #4304] Fix license check failures --- .github/workflows/license-checker.yaml | 16 +++++++++++++ .licenserc.yaml | 17 +++++++++----- .../rocketmq/broker/util/ServiceProvider.java | 23 ++++++++++++------- .../rocketmq/store/FlushDiskWatcherTest.java | 14 +++++------ 4 files changed, 49 insertions(+), 21 deletions(-) diff --git a/.github/workflows/license-checker.yaml b/.github/workflows/license-checker.yaml index eb4629d6d2..584f5f95cb 100644 --- a/.github/workflows/license-checker.yaml +++ b/.github/workflows/license-checker.yaml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + name: License checker on: diff --git a/.licenserc.yaml b/.licenserc.yaml index 03fd825777..a6c5cd0bb6 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -25,16 +25,21 @@ header: - '.gitignore' - '.travis.yml' - 'CONTRIBUTING.md' - - 'bin/README.md' + - 'LICENSE' + - 'NOTICE' + - '**/*.md' + - 'BUILDING' - '.github/**' - - 'src/test/resources/certs/*' + - '*/src/test/resources/certs/*' - 'src/test/**/*.log' - - 'src/test/resources/META-INF/service/*' - - 'src/main/resources/META-INF/service/*' - - '*/target/**' - - '*/*.iml' + - '*/src/test/resources/META-INF/service/*' + - '*/src/main/resources/META-INF/service/*' + - '**/target/**' + - '**/*.iml' - 'docs/**' - 'localbin/**' + - 'distribution/LICENSE-BIN' + - 'distribution/NOTICE-BIN' comment: on-failure \ No newline at end of file diff --git a/broker/src/main/java/org/apache/rocketmq/broker/util/ServiceProvider.java b/broker/src/main/java/org/apache/rocketmq/broker/util/ServiceProvider.java index e679660104..b77292ed24 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/util/ServiceProvider.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/util/ServiceProvider.java @@ -1,11 +1,18 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to - * You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.rocketmq.broker.util; diff --git a/store/src/test/java/org/apache/rocketmq/store/FlushDiskWatcherTest.java b/store/src/test/java/org/apache/rocketmq/store/FlushDiskWatcherTest.java index 60f392d4b6..97968f5938 100644 --- a/store/src/test/java/org/apache/rocketmq/store/FlushDiskWatcherTest.java +++ b/store/src/test/java/org/apache/rocketmq/store/FlushDiskWatcherTest.java @@ -1,13 +1,13 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,13 +17,13 @@ package org.apache.rocketmq.store; -import java.util.LinkedList; -import java.util.List; - import org.apache.rocketmq.store.CommitLog.GroupCommitRequest; import org.junit.Assert; import org.junit.Test; +import java.util.LinkedList; +import java.util.List; + public class FlushDiskWatcherTest { private final long timeoutMill = 5000;