From c592f60acce7961d231a48ceeea95f373e022f41 Mon Sep 17 00:00:00 2001 From: VGalaxies Date: Tue, 6 Feb 2024 21:05:08 +0800 Subject: [PATCH 1/7] improve license header checker confs --- .github/workflows/licence-checker.yml | 2 +- .licenserc.yaml | 37 +++++++++++++++------------ pom.xml | 17 +++++++++++- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/.github/workflows/licence-checker.yml b/.github/workflows/licence-checker.yml index 7a8e5dcca1..5e954ce30c 100644 --- a/.github/workflows/licence-checker.yml +++ b/.github/workflows/licence-checker.yml @@ -24,7 +24,7 @@ jobs: token: ${{ github.token }} config: .licenserc.yaml - - name: License check(RAT) + - name: License check (RAT) run: | mvn apache-rat:check -ntp find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt diff --git a/.licenserc.yaml b/.licenserc.yaml index 69e9557ec3..8bc2470832 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -26,7 +26,9 @@ header: # `header` section is configurations for source codes license header. 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. @@ -34,20 +36,20 @@ header: # `header` section is configurations for source codes license header. limitations under the License. # `pattern` is optional regexp if all the file headers are the same as `license` or the license of `spdx-id` and `copyright-owner`. pattern: | - Licensed to the Apache Software Foundation under one or more contributor - license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright - ownership. The Apache Software Foundation 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 + 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. + + 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. paths: # `paths` are the path list that will be checked (and fixed) by license-eye, default is ['**']. - '**' @@ -90,10 +92,11 @@ header: # `header` section is configurations for source codes license header. - '.repository/**' - '**/.flattened-pom.xml' - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SnowflakeIdGenerator.java' - - '**/optimize/HugeScriptTraversal.java' - - '**/type/Nameable.java' - - '**/define/Cardinality.java' - - '**/util/StringEncoding.java' + - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java' + - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java' + - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java' + - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java' + - 'hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessBasicSuite.java' - 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java' - 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java' comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`. diff --git a/pom.xml b/pom.xml index 6917da79f6..e96b007df4 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ **/*.map **/*.properties dist/**/* - **/assembly/static/bin/hugegraph.service + **/bin/hugegraph.service **/swagger-ui/**/* scripts/dev/reviewers scripts/dev/reviewers @@ -207,6 +207,21 @@ + + + org.apache.rat + apache-rat-plugin + + + license-check + + check + + verify + + + + From f320ca9ba95d83274c6c98193ed1f2904fbd5d01 Mon Sep 17 00:00:00 2001 From: VGalaxies Date: Tue, 6 Feb 2024 21:12:48 +0800 Subject: [PATCH 2/7] typo --- .github/workflows/licence-checker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/licence-checker.yml b/.github/workflows/licence-checker.yml index 5e954ce30c..43ce6adf72 100644 --- a/.github/workflows/licence-checker.yml +++ b/.github/workflows/licence-checker.yml @@ -24,7 +24,7 @@ jobs: token: ${{ github.token }} config: .licenserc.yaml - - name: License check (RAT) + - name: License Check (RAT) run: | mvn apache-rat:check -ntp find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt From 79367bf54d5649907590ad76fb4724ab615a1e7a Mon Sep 17 00:00:00 2001 From: VGalaxies Date: Wed, 7 Feb 2024 13:35:24 +0800 Subject: [PATCH 3/7] verify -> validate --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e96b007df4..793b23ab08 100644 --- a/pom.xml +++ b/pom.xml @@ -217,7 +217,7 @@ check - verify + validate From 17cc0f09ed4c607b3d150ab58d9176893bceeb55 Mon Sep 17 00:00:00 2001 From: VGalaxies Date: Wed, 7 Feb 2024 14:25:14 +0800 Subject: [PATCH 4/7] update rat exclude files --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index bbb0e72524..96a62dfb8c 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,7 @@ CONFIG.ini GROUPS OWNERS + **/hugegraph-test/rocksdb-* .github/**/* .gitignore From b75ca0cc6189868c97c995bf7aed154057c3e563 Mon Sep 17 00:00:00 2001 From: VGalaxies Date: Wed, 7 Feb 2024 15:48:13 +0800 Subject: [PATCH 5/7] empty commit From 74f4bf04cb0f81fa9e44106568c0796c9d1254b4 Mon Sep 17 00:00:00 2001 From: VGalaxies Date: Wed, 7 Feb 2024 16:56:33 +0800 Subject: [PATCH 6/7] update rat exclude files --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96a62dfb8c..e7d4e6e453 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,6 @@ CONFIG.ini GROUPS OWNERS - **/hugegraph-test/rocksdb-* .github/**/* .gitignore @@ -176,6 +175,10 @@ .repository/** **/.flattened-pom.xml + + **/rocksdb-*/** + **/hbase-*/** + **/apache-cassandra-*/** true From e3d9fea850b4ab10417639517caf8a20f4c82424 Mon Sep 17 00:00:00 2001 From: VGalaxies Date: Wed, 7 Feb 2024 17:14:59 +0800 Subject: [PATCH 7/7] update rat exclude files --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index e7d4e6e453..3de7393dba 100644 --- a/pom.xml +++ b/pom.xml @@ -179,6 +179,7 @@ **/rocksdb-*/** **/hbase-*/** **/apache-cassandra-*/** + **/pid true