This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 9445b7887 [ISSUE #4304] Fix license check failures
9445b7887 is described below
commit 9445b788757c437a0cb85964f81f9ab4af9ef90f
Author: caigy <[email protected]>
AuthorDate: Fri May 13 16:14:42 2022 +0800
[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 eb4629d6d..584f5f95c 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 03fd82577..a6c5cd0bb 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 e67966010..b77292ed2 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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 60f392d4b..97968f593 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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;
