From 3afa91f66054768b4de56903282217dab09a19ae Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Fri, 25 Nov 2022 10:52:30 +0800 Subject: [PATCH 01/23] change path --- hugegraph-loader/assembly/static/example/file/struct.json | 8 ++++---- .../assembly/static/example/spark/struct.json | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hugegraph-loader/assembly/static/example/file/struct.json b/hugegraph-loader/assembly/static/example/file/struct.json index d01fd0a0f..ba2332cd0 100644 --- a/hugegraph-loader/assembly/static/example/file/struct.json +++ b/hugegraph-loader/assembly/static/example/file/struct.json @@ -4,7 +4,7 @@ "label": "person", "input": { "type": "file", - "path": "example/file/vertex_person.csv", + "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/file/vertex_person.csv", "format": "CSV", "header": ["name", "age", "city"], "charset": "UTF-8", @@ -18,7 +18,7 @@ "label": "software", "input": { "type": "file", - "path": "example/file/vertex_software.txt", + "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/file/vertex_software.txt", "format": "TEXT", "delimiter": "|", "charset": "GBK" @@ -34,7 +34,7 @@ "target": ["target_name"], "input": { "type": "file", - "path": "example/file/edge_knows.json", + "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/file/edge_knows.json", "format": "JSON", "date_format": "yyyyMMdd" }, @@ -49,7 +49,7 @@ "target": ["target_id"], "input": { "type": "file", - "path": "example/file/edge_created.json", + "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/file/edge_created.json", "format": "JSON", "date_format": "yyyy-MM-dd" }, diff --git a/hugegraph-loader/assembly/static/example/spark/struct.json b/hugegraph-loader/assembly/static/example/spark/struct.json index 275bdbd32..8c9c7f39e 100644 --- a/hugegraph-loader/assembly/static/example/spark/struct.json +++ b/hugegraph-loader/assembly/static/example/spark/struct.json @@ -4,7 +4,7 @@ "label": "person", "input": { "type": "file", - "path": "example/spark/vertex_person.json", + "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/spark/vertex_person.json", "format": "JSON", "header": ["name", "age", "city"], "charset": "UTF-8", @@ -19,7 +19,7 @@ "label": "software", "input": { "type": "file", - "path": "example/spark/vertex_software.json", + "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/spark/vertex_software.json", "format": "JSON", "header": ["id","name", "lang", "price","ISBN"], "charset": "GBK" @@ -35,7 +35,7 @@ "target": ["target_name"], "input": { "type": "file", - "path": "example/spark/edge_knows.json", + "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/spark/edge_knows.json", "format": "JSON", "date_format": "yyyyMMdd", "header": ["source_name","target_name", "date", "weight"] From cc2de16185fcbd89f37b0fa8a9e7759798a37f08 Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Mon, 31 Oct 2022 16:01:03 +0800 Subject: [PATCH 02/23] support check license header with RAT client model --- .github/workflows/client-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml index 2dc7864ba..22d5b8d42 100644 --- a/.github/workflows/client-ci.yml +++ b/.github/workflows/client-ci.yml @@ -46,6 +46,11 @@ jobs: with: fetch-depth: 2 + - name: License check(RAT) + run: | + mvn apache-rat:check | grep -v "Downloading\|Downloaded\|Progress" + find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt && cat merged-rat.txt + - name: Compile run: | mvn -e compile -pl hugegraph-client -Dmaven.javadoc.skip=true -ntp From d172989f10350ae96502e8d7f47a099a673f437d Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Thu, 3 Nov 2022 13:52:30 +0800 Subject: [PATCH 03/23] check license --- .github/workflows/check-license.yml | 63 +++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 .github/workflows/check-license.yml diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml new file mode 100644 index 000000000..23972f921 --- /dev/null +++ b/.github/workflows/check-license.yml @@ -0,0 +1,63 @@ +# +# 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 check + +# This GitHub workflow checks Apache License v2.0 Header is added if needed + +on: + push: + branches: + - master + - /^release-.*$/ + paths: + - hugegraph-client/** + - hugegraph-dist/** + - .github/workflows/** + - pom.xml + pull_request: + paths: + - hugegraph-client/** + - hugegraph-dist/** + - .github/workflows/** + - pom.xml + +concurrency: + group: lincense-${{ github.ref }} + cancel-in-progress: true + +jobs: + rat: + name: License + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + - name: Setup JDK 8 + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 8 + cache: 'maven' + check-latest: false + - run: >- + mvn apache-rat:check + - name: Upload rat report + if: failure() + uses: actions/upload-artifact@v3 + with: + name: rat-report + path: "**/target/rat*.txt" \ No newline at end of file From 3d6c83e63c19fa95ab8991a689a5fc0c75c8ef7c Mon Sep 17 00:00:00 2001 From: YangJiaqi Date: Wed, 2 Nov 2022 23:05:26 +0800 Subject: [PATCH 04/23] Update pom.xml From af7e9ca17c282e7506419ecb3f012b18c7cc1ccb Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Thu, 3 Nov 2022 14:22:15 +0800 Subject: [PATCH 05/23] check license test --- .github/workflows/check-license.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml index 23972f921..5cff63227 100644 --- a/.github/workflows/check-license.yml +++ b/.github/workflows/check-license.yml @@ -36,10 +36,6 @@ on: - .github/workflows/** - pom.xml -concurrency: - group: lincense-${{ github.ref }} - cancel-in-progress: true - jobs: rat: name: License From 36a05307cbdba4cbaadf9901240386b5a8bc06f9 Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Thu, 3 Nov 2022 14:24:41 +0800 Subject: [PATCH 06/23] test --- .github/workflows/check-license.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml index 5cff63227..a5072bc02 100644 --- a/.github/workflows/check-license.yml +++ b/.github/workflows/check-license.yml @@ -37,9 +37,12 @@ on: - pom.xml jobs: - rat: + rat-ci: name: License runs-on: ubuntu-22.04 + env: + TRAVIS_DIR: hugegraph-client/assembly/travis + COMMIT_ID: 8abf3d5524de3d3d5a97bbdce460a75652792b0d steps: - uses: actions/checkout@v3 - name: Setup JDK 8 From b576e530cf1d40a45d128b2a8ff4a39dc6a62ef1 Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Thu, 3 Nov 2022 14:30:08 +0800 Subject: [PATCH 07/23] fix test --- .github/workflows/check-license.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml index a5072bc02..e3c1e4eeb 100644 --- a/.github/workflows/check-license.yml +++ b/.github/workflows/check-license.yml @@ -19,22 +19,7 @@ name: License check # This GitHub workflow checks Apache License v2.0 Header is added if needed -on: - push: - branches: - - master - - /^release-.*$/ - paths: - - hugegraph-client/** - - hugegraph-dist/** - - .github/workflows/** - - pom.xml - pull_request: - paths: - - hugegraph-client/** - - hugegraph-dist/** - - .github/workflows/** - - pom.xml +on: [push, pull_request] jobs: rat-ci: @@ -52,11 +37,11 @@ jobs: java-version: 8 cache: 'maven' check-latest: false - - run: >- + - run: | mvn apache-rat:check - name: Upload rat report if: failure() uses: actions/upload-artifact@v3 with: name: rat-report - path: "**/target/rat*.txt" \ No newline at end of file + path: "**/target/rat*.txt" From db60cfc4f064f89512f414097b146b94141ddccc Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Wed, 9 Nov 2022 21:09:15 +0800 Subject: [PATCH 08/23] add license checker for ci --- .github/workflows/check-license.yml | 47 ------------------ .github/workflows/license-checker.yml | 42 ++++++++++++++++ .licenserc.yaml | 71 +++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/check-license.yml create mode 100644 .github/workflows/license-checker.yml create mode 100644 .licenserc.yaml diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml deleted file mode 100644 index e3c1e4eeb..000000000 --- a/.github/workflows/check-license.yml +++ /dev/null @@ -1,47 +0,0 @@ -# -# 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 check - -# This GitHub workflow checks Apache License v2.0 Header is added if needed - -on: [push, pull_request] - -jobs: - rat-ci: - name: License - runs-on: ubuntu-22.04 - env: - TRAVIS_DIR: hugegraph-client/assembly/travis - COMMIT_ID: 8abf3d5524de3d3d5a97bbdce460a75652792b0d - steps: - - uses: actions/checkout@v3 - - name: Setup JDK 8 - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 8 - cache: 'maven' - check-latest: false - - run: | - mvn apache-rat:check - - name: Upload rat report - if: failure() - uses: actions/upload-artifact@v3 - with: - name: rat-report - path: "**/target/rat*.txt" diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml new file mode 100644 index 000000000..7f9b2caa4 --- /dev/null +++ b/.github/workflows/license-checker.yml @@ -0,0 +1,42 @@ +# +# 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: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + check-license: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Check License Header + uses: apache/skywalking-eyes@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + log: info + config: .licenserc.yaml \ No newline at end of file diff --git a/.licenserc.yaml b/.licenserc.yaml new file mode 100644 index 000000000..1ad0cbee6 --- /dev/null +++ b/.licenserc.yaml @@ -0,0 +1,71 @@ +# +# 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. +# + +header: # `header` section is configurations for source codes license header. + license: + spdx-id: Apache-2.0 # the spdx id of the license, it's convenient when your license is standard SPDX license. + copyright-owner: Apache Software Foundation # the copyright owner to replace the [owner] in the `spdx-id` template. + content: | # `license` will be used as the content when `fix` command needs to insert a license header. + 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. + # `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 + 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. + paths: # `paths` are the path list that will be checked (and fixed) by license-eye, default is ['**']. + - '**' + + paths-ignore: # `paths-ignore` are the path list that will be ignored by license-eye. + - 'dist' + - 'licenses' + - '**/*.md' + - 'LICENSE' + - 'NOTICE' + - '.travis.yml' + - '.gitignore' + - 'Dockerfile' + - 'docker-compose.yaml' + - 'VERSION' + - '.github' + - '.editorconfig' + comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`. + + # license-location-threshold specifies the index threshold where the license header can be located, + # after all, a "header" cannot be TOO far from the file start. + license-location-threshold: 80 \ No newline at end of file From 8eb6e2b12ea65e731b22f58970190eab23ab9cc6 Mon Sep 17 00:00:00 2001 From: imbajin Date: Mon, 7 Nov 2022 22:40:20 +0800 Subject: [PATCH 09/23] Update check-license.yml --- hugegraph-dist/scripts/dependency/check_dependencies.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/hugegraph-dist/scripts/dependency/check_dependencies.sh b/hugegraph-dist/scripts/dependency/check_dependencies.sh index 29f903107..9be52a0dc 100644 --- a/hugegraph-dist/scripts/dependency/check_dependencies.sh +++ b/hugegraph-dist/scripts/dependency/check_dependencies.sh @@ -1,4 +1,3 @@ -#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with From f8ac4f1c180a2eb27e81d89d46d817e40e565a64 Mon Sep 17 00:00:00 2001 From: imbajin Date: Mon, 7 Nov 2022 22:40:57 +0800 Subject: [PATCH 10/23] Update client-ci.yml --- .github/workflows/client-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml index 22d5b8d42..27d80141f 100644 --- a/.github/workflows/client-ci.yml +++ b/.github/workflows/client-ci.yml @@ -48,7 +48,7 @@ jobs: - name: License check(RAT) run: | - mvn apache-rat:check | grep -v "Downloading\|Downloaded\|Progress" + mvn apache-rat:check -ntp find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt && cat merged-rat.txt - name: Compile From aea6d39d8b37ca20f71b398300eee5d76eea2cad Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Wed, 9 Nov 2022 21:35:15 +0800 Subject: [PATCH 11/23] Fix: add license checker ignore. --- .licenserc.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.licenserc.yaml b/.licenserc.yaml index 1ad0cbee6..e2fa5b972 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -64,6 +64,18 @@ header: # `header` section is configurations for source codes license header. - 'VERSION' - '.github' - '.editorconfig' + - '**/*.versionsBackup' + - '**/*.log' + - '**/*.txt' + - '**/*.csv' + - '**/*.json' + - '**/*.conf' + - '**/*.properties' + - '**/*.gitattributes' + - '**/dependency-reduced-pom.xml' + - '**/logs/*.log' + - '**/target/*' + - 'style/*' comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`. # license-location-threshold specifies the index threshold where the license header can be located, From be9c3f98fe9c39a673f0213fd02b4365db9bc67c Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Wed, 9 Nov 2022 21:58:01 +0800 Subject: [PATCH 12/23] Fix: fix license automatically. --- .github/workflows/client-ci.yml | 5 ----- .github/workflows/license-checker.yml | 16 +++++++++++++++- .licenserc.yaml | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml index 27d80141f..2dc7864ba 100644 --- a/.github/workflows/client-ci.yml +++ b/.github/workflows/client-ci.yml @@ -46,11 +46,6 @@ jobs: with: fetch-depth: 2 - - name: License check(RAT) - run: | - mvn apache-rat:check -ntp - find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt && cat merged-rat.txt - - name: Compile run: | mvn -e compile -pl hugegraph-client -Dmaven.javadoc.skip=true -ntp diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 7f9b2caa4..e6caf1c9a 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -39,4 +39,18 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: log: info - config: .licenserc.yaml \ No newline at end of file + config: .licenserc.yaml + + - name: Fix License Header + uses: apache/skywalking-eyes/header@main + with: + mode: fix + + - name: Apply Changes + uses: EndBug/add-and-commit@v4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + author_name: License Bot + author_email: license_bot@github.com + message: 'Automatic application of license header' \ No newline at end of file diff --git a/.licenserc.yaml b/.licenserc.yaml index e2fa5b972..24ae355b1 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -76,6 +76,7 @@ header: # `header` section is configurations for source codes license header. - '**/logs/*.log' - '**/target/*' - 'style/*' + - '**/hubble-fe/*' comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`. # license-location-threshold specifies the index threshold where the license header can be located, From fe194dcd39f59b2f04bde713308875595d682781 Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Wed, 9 Nov 2022 23:08:10 +0800 Subject: [PATCH 13/23] add blank line --- .github/workflows/license-checker.yml | 6 +----- .licenserc.yaml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index e6caf1c9a..08ec68612 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -40,10 +40,6 @@ jobs: with: log: info config: .licenserc.yaml - - - name: Fix License Header - uses: apache/skywalking-eyes/header@main - with: mode: fix - name: Apply Changes @@ -53,4 +49,4 @@ jobs: with: author_name: License Bot author_email: license_bot@github.com - message: 'Automatic application of license header' \ No newline at end of file + message: 'Automatic application of license header' diff --git a/.licenserc.yaml b/.licenserc.yaml index 24ae355b1..f2bd42b97 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -81,4 +81,4 @@ header: # `header` section is configurations for source codes license header. # license-location-threshold specifies the index threshold where the license header can be located, # after all, a "header" cannot be TOO far from the file start. - license-location-threshold: 80 \ No newline at end of file + license-location-threshold: 80 From af6a056f77a599b1f1ecd50a8fcfe3bf4ee39734 Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Wed, 9 Nov 2022 23:36:02 +0800 Subject: [PATCH 14/23] fix license automatic --- .github/workflows/license-checker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 08ec68612..4dcc5f0b7 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v2 - name: Check License Header - uses: apache/skywalking-eyes@main + uses: apache/skywalking-eyes/header@main env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 172427c67ac9361867840e2dba95d582189c4db4 Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Wed, 9 Nov 2022 23:47:00 +0800 Subject: [PATCH 15/23] check license --- .github/workflows/license-checker.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 4dcc5f0b7..950a799bb 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -34,19 +34,9 @@ jobs: - uses: actions/checkout@v2 - name: Check License Header - uses: apache/skywalking-eyes/header@main + uses: apache/skywalking-eyes@main env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: log: info config: .licenserc.yaml - mode: fix - - - name: Apply Changes - uses: EndBug/add-and-commit@v4 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - author_name: License Bot - author_email: license_bot@github.com - message: 'Automatic application of license header' From 0670bf54703fb51be9481a63d8023bbe53b37c4d Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Wed, 9 Nov 2022 23:57:22 +0800 Subject: [PATCH 16/23] ignore hubble-fe --- .licenserc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index f2bd42b97..79d3c1f08 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -76,7 +76,7 @@ header: # `header` section is configurations for source codes license header. - '**/logs/*.log' - '**/target/*' - 'style/*' - - '**/hubble-fe/*' + - 'hugegraph-hubble/hubble-fe/*' comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`. # license-location-threshold specifies the index threshold where the license header can be located, From 866b1bfa756ea2c8fc5aebae20e576bae9400596 Mon Sep 17 00:00:00 2001 From: imbajin Date: Tue, 22 Nov 2022 22:10:04 +0800 Subject: [PATCH 17/23] Update .github/workflows/license-checker.yml Co-authored-by: Cong Zhao --- .github/workflows/license-checker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 950a799bb..53d92d38f 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -31,7 +31,7 @@ jobs: check-license: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Check License Header uses: apache/skywalking-eyes@main From ae416c0d6d9db49fff008dffb2a5f78c5573b22d Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Fri, 25 Nov 2022 12:19:43 +0800 Subject: [PATCH 18/23] change ignore path --- .licenserc.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index 79d3c1f08..f35af4c38 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -55,15 +55,8 @@ header: # `header` section is configurations for source codes license header. - 'dist' - 'licenses' - '**/*.md' - - 'LICENSE' - - 'NOTICE' - - '.travis.yml' - '.gitignore' - - 'Dockerfile' - - 'docker-compose.yaml' - - 'VERSION' - '.github' - - '.editorconfig' - '**/*.versionsBackup' - '**/*.log' - '**/*.txt' @@ -75,8 +68,7 @@ header: # `header` section is configurations for source codes license header. - '**/dependency-reduced-pom.xml' - '**/logs/*.log' - '**/target/*' - - 'style/*' - - 'hugegraph-hubble/hubble-fe/*' + - 'hugegraph-hubble/*' comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`. # license-location-threshold specifies the index threshold where the license header can be located, From d7c18e63df1ac7ba2447b1f176c67c231905a5ec Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Fri, 25 Nov 2022 21:50:47 +0800 Subject: [PATCH 19/23] add url skywalking-eyes --- .github/workflows/license-checker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 53d92d38f..0a06c42a1 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - + # A full-featured license tool to check and fix license headers and resolve dependencies' licenses: https://github.com/apache/skywalking-eyes - name: Check License Header uses: apache/skywalking-eyes@main env: From 3e3d39a086963aeef0ce2bb96294b4888e8abab5 Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Mon, 28 Nov 2022 14:03:37 +0800 Subject: [PATCH 20/23] change ignore path && fix license header --- .licenserc.yaml | 25 ++++++++++++++----- hugegraph-hubble/Dockerfile | 15 +++++++++++ hugegraph-hubble/hubble-be/pom.xml | 14 +++++++++++ .../entity/schema/SchemaConflict.java | 13 ++++++++++ .../test/python/steps/check_server_status.py | 14 +++++++++++ hugegraph-hubble/hubble-dist/pom.xml | 14 +++++++++++ hugegraph-hubble/yarn.lock | 0 7 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 hugegraph-hubble/yarn.lock diff --git a/.licenserc.yaml b/.licenserc.yaml index f35af4c38..ca5d38ab6 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -52,23 +52,36 @@ header: # `header` section is configurations for source codes license header. - '**' paths-ignore: # `paths-ignore` are the path list that will be ignored by license-eye. - - 'dist' - - 'licenses' - - '**/*.md' - '.gitignore' - - '.github' + - 'LICENSE' + - '**/*.md' - '**/*.versionsBackup' - '**/*.log' - '**/*.txt' - '**/*.csv' - '**/*.json' - '**/*.conf' + - '**/*.sql' + - '**/*.groovy' + - '**/*.svg' + - '**/*.less' + - '**/*.ts' + - '**/*.tsx' - '**/*.properties' - '**/*.gitattributes' - - '**/dependency-reduced-pom.xml' + - '**/.flattened-pom.xml' + - '**/.prettierrc' + - '**/.stylelintrc' + - '**/check_server_status.feature' + - '**/file_with_empty_line' + - '**/file_without_empty_line' + - 'hugegraph-dist/**' + - '**/hubble-dist/**' + - 'assembly/**' + - '.github/**/*' - '**/logs/*.log' - '**/target/*' - - 'hugegraph-hubble/*' + # - 'hugegraph-hubble/hubble-fe/**' comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`. # license-location-threshold specifies the index threshold where the license header can be located, diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index af3430d8c..51b0aa24e 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -1,3 +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. +# + FROM ubuntu:xenial RUN set -x \ diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml index 17ba84899..590e8a834 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -1,4 +1,18 @@ + diff --git a/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java index 6970ed97f..ecc0a45a5 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java @@ -1,5 +1,18 @@ /* * Copyright (C) 2019 Baidu, Inc. All Rights Reserved. + * + * 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.hugegraph.entity.schema; diff --git a/hugegraph-hubble/hubble-be/src/test/python/steps/check_server_status.py b/hugegraph-hubble/hubble-be/src/test/python/steps/check_server_status.py index 51ae81d07..99045fd9b 100644 --- a/hugegraph-hubble/hubble-be/src/test/python/steps/check_server_status.py +++ b/hugegraph-hubble/hubble-be/src/test/python/steps/check_server_status.py @@ -1,4 +1,18 @@ # -*- coding: UTF-8 -*- +# +# 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. +# import json import sys diff --git a/hugegraph-hubble/hubble-dist/pom.xml b/hugegraph-hubble/hubble-dist/pom.xml index 3ffc38c90..cc65a8660 100644 --- a/hugegraph-hubble/hubble-dist/pom.xml +++ b/hugegraph-hubble/hubble-dist/pom.xml @@ -1,4 +1,18 @@ + diff --git a/hugegraph-hubble/yarn.lock b/hugegraph-hubble/yarn.lock new file mode 100644 index 000000000..e69de29bb From dcfce224f6a67ae864184c0931d5651f0ecfb40f Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Mon, 28 Nov 2022 15:52:30 +0800 Subject: [PATCH 21/23] change ignore path && fix license header --- .licenserc.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.licenserc.yaml b/.licenserc.yaml index ca5d38ab6..54c12086e 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -73,6 +73,10 @@ header: # `header` section is configurations for source codes license header. - '**/.prettierrc' - '**/.stylelintrc' - '**/check_server_status.feature' + - '**/yarn.lock' + - '**/.env' + - '**/config-overrides.js' + - '**/index.html' - '**/file_with_empty_line' - '**/file_without_empty_line' - 'hugegraph-dist/**' From 06cd26988aeb137be698e371c3c7606df6196f00 Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Mon, 28 Nov 2022 17:22:08 +0800 Subject: [PATCH 22/23] roll back --- hugegraph-dist/scripts/dependency/check_dependencies.sh | 1 + hugegraph-loader/assembly/static/example/file/struct.json | 8 ++++---- .../assembly/static/example/spark/struct.json | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hugegraph-dist/scripts/dependency/check_dependencies.sh b/hugegraph-dist/scripts/dependency/check_dependencies.sh index 9be52a0dc..29f903107 100644 --- a/hugegraph-dist/scripts/dependency/check_dependencies.sh +++ b/hugegraph-dist/scripts/dependency/check_dependencies.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with diff --git a/hugegraph-loader/assembly/static/example/file/struct.json b/hugegraph-loader/assembly/static/example/file/struct.json index ba2332cd0..d01fd0a0f 100644 --- a/hugegraph-loader/assembly/static/example/file/struct.json +++ b/hugegraph-loader/assembly/static/example/file/struct.json @@ -4,7 +4,7 @@ "label": "person", "input": { "type": "file", - "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/file/vertex_person.csv", + "path": "example/file/vertex_person.csv", "format": "CSV", "header": ["name", "age", "city"], "charset": "UTF-8", @@ -18,7 +18,7 @@ "label": "software", "input": { "type": "file", - "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/file/vertex_software.txt", + "path": "example/file/vertex_software.txt", "format": "TEXT", "delimiter": "|", "charset": "GBK" @@ -34,7 +34,7 @@ "target": ["target_name"], "input": { "type": "file", - "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/file/edge_knows.json", + "path": "example/file/edge_knows.json", "format": "JSON", "date_format": "yyyyMMdd" }, @@ -49,7 +49,7 @@ "target": ["target_id"], "input": { "type": "file", - "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/file/edge_created.json", + "path": "example/file/edge_created.json", "format": "JSON", "date_format": "yyyy-MM-dd" }, diff --git a/hugegraph-loader/assembly/static/example/spark/struct.json b/hugegraph-loader/assembly/static/example/spark/struct.json index 8c9c7f39e..275bdbd32 100644 --- a/hugegraph-loader/assembly/static/example/spark/struct.json +++ b/hugegraph-loader/assembly/static/example/spark/struct.json @@ -4,7 +4,7 @@ "label": "person", "input": { "type": "file", - "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/spark/vertex_person.json", + "path": "example/spark/vertex_person.json", "format": "JSON", "header": ["name", "age", "city"], "charset": "UTF-8", @@ -19,7 +19,7 @@ "label": "software", "input": { "type": "file", - "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/spark/vertex_software.json", + "path": "example/spark/vertex_software.json", "format": "JSON", "header": ["id","name", "lang", "price","ISBN"], "charset": "GBK" @@ -35,7 +35,7 @@ "target": ["target_name"], "input": { "type": "file", - "path": "/Users/yangjiaqi/Documents/sourceCode/TB/incubator-hugegraph-toolchain/hugegraph-loader/assembly/static/example/spark/edge_knows.json", + "path": "example/spark/edge_knows.json", "format": "JSON", "date_format": "yyyyMMdd", "header": ["source_name","target_name", "date", "weight"] From c01f5e179d8ed2ff123308ccd5dd9f180adc46da Mon Sep 17 00:00:00 2001 From: imbajin Date: Mon, 28 Nov 2022 17:56:31 +0800 Subject: [PATCH 23/23] remove bd --- .../java/org/apache/hugegraph/entity/schema/SchemaConflict.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java index ecc0a45a5..ff956bf02 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java @@ -1,6 +1,4 @@ /* - * Copyright (C) 2019 Baidu, Inc. All Rights Reserved. - * * 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.