diff --git a/.asf.yaml b/.asf.yaml index 6c78530425..d97e5c183d 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -41,7 +41,8 @@ github: - Analyze (java) - CodeQL - check-license - - build (memory, 11) + - build-server (memory, 11) + - build-commons (11) required_pull_request_reviews: dismiss_stale_reviews: true require_code_owner_reviews: false diff --git a/.gitattributes b/.gitattributes index ca5e57db70..85f64d198b 100755 --- a/.gitattributes +++ b/.gitattributes @@ -12,4 +12,5 @@ hugegraph-store/hg-store-dist/src/assembly/static/bin/libjemalloc_aarch64.so exp .github/ export-ignore .idea/ export-ignore install-dist/scripts/ export-ignore +hugegraph-commons/hugegraph-dist/ export-ignore docker/ export-ignore diff --git a/.github/workflows/check-dependencies.yml b/.github/workflows/check-dependencies.yml index 6e3c572889..68f8c0e0c9 100644 --- a/.github/workflows/check-dependencies.yml +++ b/.github/workflows/check-dependencies.yml @@ -32,7 +32,7 @@ jobs: - name: mvn install run: | - mvn install -DskipTests=true -ntp + mvn install -Dmaven.test.skip=true -ntp - name: generate current dependencies run: | bash $SCRIPT_DEPENDENCY/regenerate_known_dependencies.sh current-dependencies.txt diff --git a/hugegraph-commons/.github/workflows/ci.yml b/.github/workflows/commons-ci.yml similarity index 59% rename from hugegraph-commons/.github/workflows/ci.yml rename to .github/workflows/commons-ci.yml index cc0cd1aa00..856a88b43d 100644 --- a/hugegraph-commons/.github/workflows/ci.yml +++ b/.github/workflows/commons-ci.yml @@ -1,4 +1,4 @@ -name: "hugegraph-commons ci" +name: "HugeGraph-Commons CI" on: workflow_dispatch: @@ -10,12 +10,16 @@ on: pull_request: jobs: - build: + build-commons: runs-on: ubuntu-latest + env: + # TODO: reset use stage to false later + USE_STAGE: 'true' # Whether to include the stage repository. + strategy: fail-fast: false matrix: - JAVA_VERSION: ['8', '11'] + JAVA_VERSION: ['11'] steps: - name: Install JDK ${{ matrix.JAVA_VERSION }} @@ -36,19 +40,23 @@ jobs: with: fetch-depth: 2 - - name: License check(RAT) + - name: Use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} run: | - mvn apache-rat:check -ntp - find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt - grep "Binaries" merged-rat.txt -C 3 && cat merged-rat.txt + cp $HOME/.m2/settings.xml /tmp/settings.xml + cp -vf .github/configs/settings.xml $HOME/.m2/settings.xml && cat $HOME/.m2/settings.xml - name: Compile run: | mvn compile -Dmaven.javadoc.skip=true -ntp - - name: Run test + - name: Run common test + run: | + mvn test -pl hugegraph-commons/hugegraph-common -Dtest=UnitTestSuite + + - name: Run rpc test run: | - mvn test -Dtest=UnitTestSuite + mvn test -pl hugegraph-commons/hugegraph-rpc -Dtest=UnitTestSuite - name: Upload coverage to Codecov uses: codecov/codecov-action@v3.0.0 diff --git a/.github/workflows/pd-store-ci.yml b/.github/workflows/pd-store-ci.yml index c0f4825251..44d4456920 100644 --- a/.github/workflows/pd-store-ci.yml +++ b/.github/workflows/pd-store-ci.yml @@ -1,4 +1,4 @@ -name: "Graph PD & Store & Hstore CI" +name: "HugeGraph-PD & Store & Hstore CI" on: push: @@ -14,7 +14,8 @@ jobs: runs-on: ubuntu-latest env: # TODO: avoid duplicated env setup in pd & store - USE_STAGE: 'false' # Whether to include the stage repository. + # TODO: reset use stage to false later + USE_STAGE: 'true' # Whether to include the stage repository. # TODO: remove outdated env TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis REPORT_DIR: target/site/jacoco @@ -46,11 +47,11 @@ jobs: - name: Run common test run: | - mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test + mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test -DskipCommonsTests=true - name: Run core test run: | - mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test + mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test -DskipCommonsTests=true # The above tests do not require starting a PD instance. @@ -64,11 +65,11 @@ jobs: - name: Run client test run: | - mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test + mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test -DskipCommonsTests=true - name: Run rest test run: | - mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test + mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test -DskipCommonsTests=true - name: Upload coverage to Codecov uses: codecov/codecov-action@v3.0.0 @@ -79,7 +80,7 @@ jobs: # TODO: avoid duplicated env setup runs-on: ubuntu-latest env: - USE_STAGE: 'false' # Whether to include the stage repository. + USE_STAGE: 'true' # Whether to include the stage repository. # TODO: remove outdated env TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis REPORT_DIR: target/site/jacoco @@ -120,27 +121,27 @@ jobs: - name: Run common test run: | - mvn test -pl hugegraph-store/hg-store-test -am -P store-common-test + mvn test -pl hugegraph-store/hg-store-test -am -P store-common-test -DskipCommonsTests=true - name: Run client test run: | - mvn test -pl hugegraph-store/hg-store-test -am -P store-client-test + mvn test -pl hugegraph-store/hg-store-test -am -P store-client-test -DskipCommonsTests=true - name: Run core test run: | - mvn test -pl hugegraph-store/hg-store-test -am -P store-core-test + mvn test -pl hugegraph-store/hg-store-test -am -P store-core-test -DskipCommonsTests=true - name: Run rocksdb test run: | - mvn test -pl hugegraph-store/hg-store-test -am -P store-rocksdb-test + mvn test -pl hugegraph-store/hg-store-test -am -P store-rocksdb-test -DskipCommonsTests=true - name: Run server test run: | - mvn test -pl hugegraph-store/hg-store-test -am -P store-server-test + mvn test -pl hugegraph-store/hg-store-test -am -P store-server-test -DskipCommonsTests=true - name: Run raft-core test run: | - mvn test -pl hugegraph-store/hg-store-test -am -P store-raftcore-test + mvn test -pl hugegraph-store/hg-store-test -am -P store-raftcore-test -DskipCommonsTests=true - name: Upload coverage to Codecov uses: codecov/codecov-action@v3.0.0 diff --git a/.github/workflows/server-ci.yml b/.github/workflows/server-ci.yml index bbf8a5eab6..7f7879ad05 100644 --- a/.github/workflows/server-ci.yml +++ b/.github/workflows/server-ci.yml @@ -1,4 +1,4 @@ -name: "Graph Server CI" +name: "HugeGraph-Server CI" on: push: @@ -9,11 +9,13 @@ on: pull_request: jobs: + # TODO: rename to build-server later build: # TODO: we need test & replace it to ubuntu-24.04 or ubuntu-latest runs-on: ubuntu-20.04 env: - USE_STAGE: 'false' # Whether to include the stage repository. + # TODO: reset use stage to false later + USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis REPORT_DIR: target/site/jacoco BACKEND: ${{ matrix.BACKEND }} diff --git a/BUILDING.md b/BUILDING.md index b7342e68d6..d4c807c748 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -6,7 +6,7 @@ Required: * Java 11 * Maven 3.5+ -To build without executing tests: `mvn clean package -DskipTests` +To build without executing tests: `mvn clean package -Dmaven.test.skip=true` ## Building in IDEA diff --git a/hugegraph-commons/.asf.yaml b/hugegraph-commons/.asf.yaml deleted file mode 100644 index 4354d52b08..0000000000 --- a/hugegraph-commons/.asf.yaml +++ /dev/null @@ -1,54 +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. -# - -github: - features: - # Enable issue management - issues: true - # Enable wiki for documentation - wiki: true - # Enable projects for project management boards - projects: true - description: HugeGraph Commons - include common library & RPC module - homepage: https://hugegraph.apache.org/ - del_branch_on_merge: true - #labels: - - enabled_merge_buttons: - merge: false - squash: true - rebase: true - protected_branches: - master: - required_status_checks: - # strict means "Require branches to be up-to-date before merging". - strict: true - # contexts are the names of checks that must pass - contexts: - - build (8) - - build (11) - required_pull_request_reviews: - dismiss_stale_reviews: true - require_code_owner_reviews: false - required_approving_review_count: 2 - -notifications: - pullrequests_status: dev@hugegraph.apache.org - # Note: before use the config, we should ensure the "mail" address has set well (exist) - #pullrequests_comment: issues@hugegraph.apache.org - #issues: issues@hugegraph.apache.org - #discussions: issues@hugegraph.apache.org diff --git a/hugegraph-commons/.editorconfig b/hugegraph-commons/.editorconfig deleted file mode 100644 index 5c47926694..0000000000 --- a/hugegraph-commons/.editorconfig +++ /dev/null @@ -1,31 +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. -# - -root = true - -[*] -charset = utf-8 -end_of_line = lf -insert_final_newline = true - -[*.{java, xml, py}] -indent_style = space -indent_size = 4 - -[*.{java, xml}] -# Ignore the IDEA unsupported warning & it works well (indeed) -continuation_indent_size = 8 diff --git a/hugegraph-commons/.gitattributes b/hugegraph-commons/.gitattributes deleted file mode 100644 index f34702952e..0000000000 --- a/hugegraph-commons/.gitattributes +++ /dev/null @@ -1,8 +0,0 @@ -# ignore when package to source.tgz -.github/ export-ignore -.gitattributes export-ignore -.gitignore export-ignore -.asf.yaml export-ignore -apache-release.sh export-ignore - -hugegraph-dist/scripts export-ignore diff --git a/hugegraph-commons/.github/ISSUE_TEMPLATE/bug_report.yml b/hugegraph-commons/.github/ISSUE_TEMPLATE/bug_report.yml deleted file mode 100644 index 43f22140f5..0000000000 --- a/hugegraph-commons/.github/ISSUE_TEMPLATE/bug_report.yml +++ /dev/null @@ -1,96 +0,0 @@ -name: Bug report (反馈 Bug) -description: Create a bug report to help HugeGraph improve -title: '[Bug] describe the main problem' -labels: - - bug - -body: - - type: markdown - attributes: - value: >- - ### Note (特别注意) : - - > 1. 请先**搜索**现有的[Server-Issues](https://github.com/apache/hugegraph/issues) 与 - [Commons-Issues](https://github.com/apache/hugegraph-commons/issues) 中没有与您相同 - / 相关的问题 (请勿重复提交) - - > 2. 我们需要尽可能**详细**的信息来**复现**问题, 越详细的信息 (包括**日志 / 截图 / 配置**等) - 会**越快**被响应和处理 - - > 3. Issue 标题请保持原有模板分类(例如:`[Bug]`), 长段描述之间可以增加`空行`或使用`序号`标记, 保持排版清晰 - - > 4. 请在对应的模块提交 issue, 缺乏有效信息 / 长时间 (> 14 天) 没有回复的 issue 可能会被 **关闭** - (更新时会再开启) - - - type: dropdown - attributes: - label: Bug Type (问题类型) - options: - - exception / error (异常报错) - - logic (逻辑设计问题) - - performance (性能下降) - - others (please edit later) - - - type: checkboxes - attributes: - label: Before submit - options: - - label: 我已经确认现有的 [Server-Issues](https://github.com/apache/hugegraph/issues) 与 [Commons-Issues](https://github.com/apache/hugegraph-commons/issues) 中没有相同 / 重复问题 - required: true - - - type: textarea - attributes: - label: Environment (环境信息) - description: | - > server version could get from [rest-api](https://hugegraph.apache.org/docs/clients/restful-api/) (http://localhost:8080/versions) - value: | - - Server Version: v0.11.x - - Common Version: v1.x - validations: - required: true - - - type: textarea - attributes: - label: Expected & Actual behavior (期望与实际表现) - description: | - > we can refer [How to create a minimal reproducible Example](https://stackoverflow.com/help/minimal-reproducible-example) (如何提供最简的可复现用例) - > if possible, please provide screenshots or GIF (请提供清晰的截图, 动图录屏更佳) - placeholder: | - type the main problem here - - ```java - // Exception / Error info (尽可能详细的日志 + 完整异常栈) - - ``` - validations: - required: true - - - type: textarea - attributes: - label: Vertex/Edge example (问题点 / 边数据举例) - description: | - > 如果问题与具体的点 / 边数据相关, 请提供完整的`查询语句 + 返回 JSON 结果` - placeholder: | - // Query URL - GET http://localhost:8080/gremlin?gremlin=hugegraph.traversal().V('1:tom') - - // JSON of Vertex / Edge - { - "vertex": { "id": "xxx" } - } - render: javascript - - - type: textarea - attributes: - label: Schema [VertexLabel, EdgeLabel, IndexLabel] (元数据结构) - description: | - > 如果问题与具体的点类型 / 边类型 / 索引类型相关, 请提供完整的 `Schema 返回 JSON 结果` - placeholder: | - // Query URL - GET http://localhost:8080/graphs/hugegraph/schema/vertexlabels - - // JSON of GraphSchema - { - "vertex": { "id": "xxx" } - } - render: javascript diff --git a/hugegraph-commons/.github/ISSUE_TEMPLATE/config.yml b/hugegraph-commons/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index df4d7459c0..0000000000 --- a/hugegraph-commons/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,7 +0,0 @@ -blank_issues_enabled: false - -# 设置提 issue 前的参考文档 -contact_links: - - name: HugeGraph API Doc - url: https://hugegraph.apache.org/docs/clients/ - about: Please search usage here before opening a new issue diff --git a/hugegraph-commons/.github/ISSUE_TEMPLATE/feature_request.yml b/hugegraph-commons/.github/ISSUE_TEMPLATE/feature_request.yml deleted file mode 100644 index 4012606e4a..0000000000 --- a/hugegraph-commons/.github/ISSUE_TEMPLATE/feature_request.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Feature request (新需求 / 功能) -description: Give an idea for HugeGraph -title: '[Feature] describe the new feature' -labels: - - feature - -body: - - type: textarea - attributes: - label: Feature Description (功能描述) - description: | - > 请简要描述新功能 / 需求的使用场景或上下文, 最好能给个具体的例子说明 - placeholder: type the feature description here - validations: - required: true diff --git a/hugegraph-commons/.github/ISSUE_TEMPLATE/question_ask.yml b/hugegraph-commons/.github/ISSUE_TEMPLATE/question_ask.yml deleted file mode 100644 index 2b2d0bc524..0000000000 --- a/hugegraph-commons/.github/ISSUE_TEMPLATE/question_ask.yml +++ /dev/null @@ -1,94 +0,0 @@ -name: Ask question (提问) -description: Question about usage or configs in HugeGraph -title: '[Question] describe your problem' - -body: - - type: markdown - attributes: - value: >- - ### Note (特别注意) : - - > 1. 请先**搜索**现有的[Server-Issues](https://github.com/apache/hugegraph/issues) 与 - [Commons-Issues](https://github.com/apache/hugegraph-commons/issues) 中没有与您相同 - / 相关的问题 (请勿重复提交) - - > 2. 我们需要尽可能**详细**的信息来**复现**问题, 越详细的信息 (包括**日志 / 截图 / 配置**等) - 会**越快**被响应和处理 - - > 3. Issue 标题请保持原有模板分类(例如:`[Bug]`), 长段描述之间可以增加`空行`或使用`序号`标记, 保持排版清晰 - - > 4. 请在对应的模块提交 issue, 缺乏有效信息 / 长时间 (> 14 天) 没有回复的 issue 可能会被 **关闭** - (更新时会再开启) - - - type: dropdown - attributes: - label: Problem Type (问题类型) - options: - - struct / logic (架构 / 逻辑设计问题) - - performance (性能优化) - - exception / error (异常报错) - - others (please edit later) - - - type: checkboxes - attributes: - label: Before submit - options: - - label: 我已经确认现有的 [Server-Issues](https://github.com/apache/hugegraph/issues) 与 [Commons-Issues](https://github.com/apache/hugegraph-commons/issues) 中没有相同 / 重复问题 - required: true - - - type: textarea - attributes: - label: Environment (环境信息) - description: | - > server version could get from [rest-api](https://hugegraph.apache.org/docs/clients/restful-api/) (http://localhost:8080/versions) - value: | - - Server Version: v0.11.x - - Common Version: v1.x - validations: - required: true - - - type: textarea - attributes: - label: Your Question (问题描述) - description: | - > 图使用 / 配置相关问题，请优先参考 [REST-API 文档](https://hugegraph.apache.org/docs/clients/restful-api/), 以及 [Server 配置文档](https://hugegraph.apache.org/docs/config/config-option/) - > if possible, please provide screenshots or GIF (请提供清晰的截图, 动图录屏更佳) - placeholder: | - type the main problem here - - ```java - // Exception / Error info (尽可能详细的日志 + 完整异常栈) - - ``` - validations: - required: true - - - type: textarea - attributes: - label: Vertex/Edge example (问题点 / 边数据举例) - description: | - > 如果问题与具体的点 / 边数据相关, 请提供完整的`查询语句 + 返回 JSON 结果` - placeholder: | - // Query URL - GET http://localhost:8080/gremlin?gremlin=hugegraph.traversal().V('1:tom') - - // JSON of Vertex / Edge - { - "vertex": { "id": "xxx" } - } - render: javascript - - - type: textarea - attributes: - label: Schema [VertexLabel, EdgeLabel, IndexLabel] (元数据结构) - description: | - > 如果问题与具体的点类型 / 边类型 / 索引类型相关, 请提供完整的 `Schema 返回 JSON 结果` - placeholder: | - // Query URL - GET http://localhost:8080/graphs/hugegraph/schema/vertexlabels - - // JSON of GraphSchema - { - "vertex": { "id": "xxx" } - } - render: javascript diff --git a/hugegraph-commons/.github/outdated/.travis.yml b/hugegraph-commons/.github/outdated/.travis.yml deleted file mode 100644 index 8df38075e5..0000000000 --- a/hugegraph-commons/.github/outdated/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: java - -jdk: - - openjdk8 - -install: mvn compile -Dmaven.javadoc.skip=true - -script: mvn test -Dtest=UnitTestSuite - -after_success: - - bash <(curl -s https://codecov.io/bash) diff --git a/hugegraph-commons/.github/outdated/cla.yml b/hugegraph-commons/.github/outdated/cla.yml deleted file mode 100644 index a182b9515b..0000000000 --- a/hugegraph-commons/.github/outdated/cla.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: "CLA Assistant" -on: - issue_comment: - types: [created] - pull_request_target: - types: [opened,closed,synchronize] - -jobs: - CLAssistant: - runs-on: ubuntu-latest - steps: - - name: "CLA Assistant" - if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - uses: cla-assistant/github-action@v2.1.3-beta - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # the below token should have repo scope and must be manually added by you in the repository's secret - PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} - with: - path-to-signatures: '.github/cla-signatures/cla.json' - path-to-document: 'https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md' # e.g. a CLA or a DCO document - custom-allsigned-prcomment: '**Good**! All Contributors have signed the [CLA](https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md).' - # branch should not be protected - branch: 'cla-assist' - allowlist: bot* - lock-pullrequest-aftermerge: false - - # the following are the optional inputs - If the optional inputs are not given, then default values will be taken - #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) - #remote-repository-name: enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository) - #create-file-commit-message: 'For example: Creating file for storing CLA Signatures' - #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' - #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' - #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' - #use-dco-flag: true - If you are using DCO instead of CLA diff --git a/hugegraph-commons/.github/outdated/release.yml b/hugegraph-commons/.github/outdated/release.yml deleted file mode 100644 index 7c1e641fa1..0000000000 --- a/hugegraph-commons/.github/outdated/release.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: release maven package - -on: - release: - types: [ published ] - -jobs: - build: - runs-on: ubuntu-20.04 - steps: - - name: Install JDK 8 - uses: actions/setup-java@v3 - with: - java-version: '8' - distribution: 'zulu' - - - name: Cache Maven packages - uses: actions/cache@v3 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - - name: Release Maven package - uses: samuelmeuli/action-maven-publish@v1 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }} - nexus_username: ${{ secrets.NEXUS_USERNAME }} - nexus_password: ${{ secrets.NEXUS_PASSWORD }} - server_id: sonatype-nexus-staging - maven_profiles: "release" - maven_args: > - -Dmaven.test.skip=true diff --git a/hugegraph-commons/.github/workflows/codeql-analysis.yml b/hugegraph-commons/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 7b895324a3..0000000000 --- a/hugegraph-commons/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,66 +0,0 @@ -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -name: "CodeQL" - -on: - pull_request: - # The branches below must be a subset of the branches above - # branches: [ master ] # enable in all PRs - schedule: - - cron: '33 15 * * 5' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - - dependency-review: - runs-on: ubuntu-latest - steps: - - name: 'Checkout Repository' - uses: actions/checkout@v3 - - name: 'Dependency Review' - uses: actions/dependency-review-action@v3 - diff --git a/hugegraph-commons/.github/workflows/license-checker.yml b/hugegraph-commons/.github/workflows/license-checker.yml deleted file mode 100644 index 0485bd1b11..0000000000 --- a/hugegraph-commons/.github/workflows/license-checker.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: "license checker" - -on: - workflow_dispatch: - push: - branches: - - master - - /^release-.*$/ - pull_request: - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - check-license-header: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - # More info could refer to: https://github.com/apache/skywalking-eyes - - name: Check License Header - uses: apache/skywalking-eyes@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - log: info - config: .licenserc.yaml - - - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'adopt' - - - name: License check(RAT) - run: | - mvn apache-rat:check -ntp - find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt - grep "Binaries" merged-rat.txt -C 3 && cat merged-rat.txt - - check-dependency-license: - runs-on: ubuntu-latest - env: - SCRIPT_DEPENDENCY: hugegraph-dist/scripts/dependency - steps: - - name: Checkout source - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'adopt' - - name: mvn install - run: | - mvn install -DskipTests=true -ntp - - name: generate current dependencies - run: | - bash $SCRIPT_DEPENDENCY/regenerate_known_dependencies.sh current-dependencies.txt - - name: check third dependencies - run: | - bash $SCRIPT_DEPENDENCY/check_dependencies.sh diff --git a/hugegraph-commons/.github/workflows/stale.yml b/hugegraph-commons/.github/workflows/stale.yml deleted file mode 100644 index c38c7afe7e..0000000000 --- a/hugegraph-commons/.github/workflows/stale.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: "Mark stale issues and pull requests" - -on: - schedule: - - cron: "0 21 * * *" - -jobs: - stale: - - runs-on: ubuntu-latest - permissions: - issues: write - pull-requests: write - - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - stale-issue-message: 'Due to the lack of activity, the current issue is marked as stale and will be closed after 20 days, any update will remove the stale label' - stale-pr-message: 'Due to the lack of activity, the current pr is marked as stale and will be closed after 180 days, any update will remove the stale label' - stale-issue-label: 'inactive' - stale-pr-label: 'inactive' - exempt-issue-labels: 'feature,bug,enhancement,improvement,todo,guide,doc,help wanted,security' - exempt-pr-labels: 'feature,bug,enhancement,improvement,todo,guide,doc,help wanted,security' - exempt-all-milestones: true - - days-before-issue-stale: 15 - days-before-issue-close: 20 - days-before-pr-stale: 30 - days-before-pr-close: 180 - operations-per-run: 10 - start-date: '2018-10-01T00:00:00Z' - - exempt-all-assignees: true - remove-stale-when-updated: true - exempt-all-pr-milestones: true - delete-branch: false - enable-statistics: true diff --git a/hugegraph-commons/.gitignore b/hugegraph-commons/.gitignore deleted file mode 100644 index 5a63c69c7d..0000000000 --- a/hugegraph-commons/.gitignore +++ /dev/null @@ -1,84 +0,0 @@ -target/ -**.db -logs/ -ui -node_modules/ -upload-files/ -demo* -gen-java -build -*.class - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -.svn - -### IntelliJ IDEA ### -.idea/ -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/nbdist/ -/.nb-gradle/ -build/ -dist/ - -### VS Code ### -.vscode/ - -# misc -.DS_Store -*/.DS_Store -**/*.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -*.orig -*.rej -**/.keep -*.sdf -*.suo -*.vcxproj.user -*.swp -*.log -*.pyc - -# maven ignore -output/ -apache-hugegraph-*-incubating-*/ -*.war -*.zip -*.tar -*.tar.gz* -tree.txt -*.versionsBackup -.flattened-pom.xml - -# eclipse ignore -.settings/ - -# temp ignore -*.cache -*.diff -*.patch -*.tmp - -# system ignore -Thumbs.db -hs_err_pid* -# mobile Tools for Java (J2ME) -.mtj.tmp/ -# blueJ files -*.ctxt diff --git a/hugegraph-commons/.licenserc.yaml b/hugegraph-commons/.licenserc.yaml deleted file mode 100644 index efa4789855..0000000000 --- a/hugegraph-commons/.licenserc.yaml +++ /dev/null @@ -1,79 +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. -# - -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. - - '.gitignore' - - 'LICENSE' - - 'NOTICE' - - 'DISCLAIMER' - - '**/*.md' - - '**/*.versionsBackup' - - '**/*.log' - - '**/*.conf' - - '**/*.txt' - - '**/*.csv' - - '**/*.json' - - '**/*.svg' - - '**/*.gitattributes' - - '**/.flattened-pom.xml' - - '**/.prettierrc' - - '**/*.MF' - - '**/.stylelintrc' - - 'assembly/**' - - '.github/**/*' - - '**/target/*' - 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 diff --git a/hugegraph-commons/DISCLAIMER b/hugegraph-commons/DISCLAIMER deleted file mode 100644 index be557e3607..0000000000 --- a/hugegraph-commons/DISCLAIMER +++ /dev/null @@ -1,7 +0,0 @@ -Apache HugeGraph (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. - -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/hugegraph-commons/LICENSE b/hugegraph-commons/LICENSE deleted file mode 100644 index 8f71f43fee..0000000000 --- a/hugegraph-commons/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed 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. - diff --git a/hugegraph-commons/NOTICE b/hugegraph-commons/NOTICE deleted file mode 100644 index 42f88212ea..0000000000 --- a/hugegraph-commons/NOTICE +++ /dev/null @@ -1,7 +0,0 @@ -Apache HugeGraph(incubating) -Copyright 2022-2023 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -The initial codebase was donated to the ASF by HugeGraph Authors, copyright 2017-2021. diff --git a/hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java b/hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java index 8ae89bd0e2..73342fdaaa 100644 --- a/hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java +++ b/hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java @@ -24,5 +24,5 @@ public class CommonVersion { public static final String NAME = "hugegraph-common"; // The second parameter of Version.of() is for all-in-one JAR - public static final Version VERSION = Version.of(CommonVersion.class, "1.3.0"); + public static final Version VERSION = Version.of(CommonVersion.class, "1.5.0"); } diff --git a/hugegraph-commons/hugegraph-common/src/test/resources/META-INF/MANIFEST.MF b/hugegraph-commons/hugegraph-common/src/test/resources/META-INF/MANIFEST.MF index 8ea4eeefb9..7abb11a917 100644 --- a/hugegraph-commons/hugegraph-common/src/test/resources/META-INF/MANIFEST.MF +++ b/hugegraph-commons/hugegraph-common/src/test/resources/META-INF/MANIFEST.MF @@ -1,9 +1,8 @@ -Manifest-Version: 1.0 -Implementation-Version: 1.8.8.0 -Archiver-Version: Plexus Archiver -Built-By: jermy -Specification-Title: hugegraph-common -Created-By: Apache Maven 3.3.9 -Build-Jdk: 1.8.0_111 -Specification-Version: 1.8.8 - +Manifest-Version: 1.0 +Implementation-Version: 1.8.8.0 +Archiver-Version: Plexus Archiver +Built-By: jermy +Specification-Title: hugegraph-common +Created-By: Apache Maven 3.3.9 +Build-Jdk: 1.8.0_111 +Specification-Version: 1.8.8 diff --git a/hugegraph-commons/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java b/hugegraph-commons/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java index ac359822d1..a2dd3d72c1 100644 --- a/hugegraph-commons/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java +++ b/hugegraph-commons/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java @@ -24,5 +24,5 @@ public class RpcVersion { public static final String NAME = "hugegraph-rpc"; // The second parameter of Version.of() is for all-in-one JAR - public static final Version VERSION = Version.of(RpcVersion.class, "1.3.0"); + public static final Version VERSION = Version.of(RpcVersion.class, "1.5.0"); } diff --git a/hugegraph-commons/pom.xml b/hugegraph-commons/pom.xml index 198247feab..91d0eb42f6 100644 --- a/hugegraph-commons/pom.xml +++ b/hugegraph-commons/pom.xml @@ -20,7 +20,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hugegraph hugegraph-commons ${revision} pom @@ -35,9 +34,10 @@ - org.apache - apache - 23 + org.apache.hugegraph + hugegraph + ${revision} + ../pom.xml @@ -90,7 +90,7 @@ - 1.3.0 + 1.5.0 UTF-8 ${project.basedir}/.. 1.8 @@ -116,6 +116,7 @@ 3.0.2 3.1.2 8.45 + false @@ -280,6 +281,15 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20 + + ${skipCommonsTests} + + diff --git a/hugegraph-commons/style/checkstyle.xml b/hugegraph-commons/style/checkstyle.xml deleted file mode 100644 index c6099a8d47..0000000000 --- a/hugegraph-commons/style/checkstyle.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hugegraph-pd/Dockerfile b/hugegraph-pd/Dockerfile index e507900ade..6ab5817f24 100644 --- a/hugegraph-pd/Dockerfile +++ b/hugegraph-pd/Dockerfile @@ -23,7 +23,7 @@ COPY . /pkg WORKDIR /pkg ARG MAVEN_ARGS -RUN mvn package $MAVEN_ARGS -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true && pwd && ls -l && rm \ +RUN mvn package $MAVEN_ARGS -e -B -ntp -Dmaven.test.skip=true -Dmaven.javadoc.skip=true && pwd && ls -l && rm \ ./hugegraph-server/*.tar.gz && rm ./hugegraph-pd/*.tar.gz && rm ./hugegraph-store/*.tar.gz # 2nd stage: runtime env diff --git a/hugegraph-server/Dockerfile b/hugegraph-server/Dockerfile index 0e39704fd6..e790162e6a 100644 --- a/hugegraph-server/Dockerfile +++ b/hugegraph-server/Dockerfile @@ -23,7 +23,7 @@ COPY . /pkg WORKDIR /pkg ARG MAVEN_ARGS -RUN mvn package $MAVEN_ARGS -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true && pwd && ls -l && rm \ +RUN mvn package $MAVEN_ARGS -e -B -ntp -Dmaven.test.skip=true -Dmaven.javadoc.skip=true && pwd && ls -l && rm \ ./hugegraph-server/*.tar.gz && rm ./hugegraph-pd/*.tar.gz && rm ./hugegraph-store/*.tar.gz # 2nd stage: runtime env diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh index 529874f58b..f83123854c 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh @@ -35,7 +35,7 @@ JACOCO_PORT=36320 RAFT_TOOLS=$RAFT1_DIR/bin/raft-tools.sh RAFT_LEADER="127.0.0.1:8091" -mvn package -DskipTests +mvn package -Dmaven.test.skip=true # mkdir for each raft-server cp -r $SERVER_DIR $RAFT1_DIR @@ -57,7 +57,7 @@ export HUGEGRAPH_PASSWORD=pa $RAFT_TOOLS --set-leader "hugegraph" "$RAFT_LEADER" # run api-test -mvn test -pl hugegraph-server/hugegraph-test -am -P api-test,$BACKEND || (cat $RAFT1_DIR/logs/hugegraph-server.log && exit 1) +mvn test -pl hugegraph-server/hugegraph-test -am -P api-test,$BACKEND -DskipCommonsTests=true || (cat $RAFT1_DIR/logs/hugegraph-server.log && exit 1) $TRAVIS_DIR/build-report.sh $BACKEND $JACOCO_PORT $REPORT_FILE diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh index 8008f39cdb..4959112149 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh @@ -29,7 +29,7 @@ REST_SERVER_CONF=$SERVER_DIR/conf/rest-server.properties GREMLIN_SERVER_CONF=$SERVER_DIR/conf/gremlin-server.yaml JACOCO_PORT=36320 -mvn package -DskipTests -ntp +mvn package -Dmaven.test.skip=true -ntp # add mysql dependency wget -P $SERVER_DIR/lib/ https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.28/mysql-connector-java-8.0.28.jar @@ -57,7 +57,7 @@ authentication: { $TRAVIS_DIR/start-server.sh $SERVER_DIR $BACKEND $JACOCO_PORT || (cat $SERVER_DIR/logs/hugegraph-server.log && exit 1) # run api-test -mvn test -pl hugegraph-server/hugegraph-test -am -P api-test,$BACKEND || (cat $SERVER_DIR/logs/hugegraph-server.log && exit 1) +mvn test -pl hugegraph-server/hugegraph-test -am -P api-test,$BACKEND -DskipCommonsTests=true || (cat $SERVER_DIR/logs/hugegraph-server.log && exit 1) $TRAVIS_DIR/build-report.sh $BACKEND $JACOCO_PORT $REPORT_FILE diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-core-test.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-core-test.sh index a95d2f0806..91e5859328 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-core-test.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-core-test.sh @@ -19,4 +19,4 @@ set -ev BACKEND=$1 -mvn test -pl hugegraph-server/hugegraph-test -am -P core-test,$BACKEND +mvn test -pl hugegraph-server/hugegraph-test -am -P core-test,$BACKEND -DskipCommonsTests=true diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-tinkerpop-test.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-tinkerpop-test.sh index 87d60c8880..6c43dac1d7 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-tinkerpop-test.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-tinkerpop-test.sh @@ -21,9 +21,9 @@ BACKEND=$1 SUITE=$2 if [[ "$SUITE" == "structure" || "$SUITE" == "tinkerpop" ]]; then - mvn test -pl hugegraph-server/hugegraph-test -am -P tinkerpop-structure-test,$BACKEND + mvn test -pl hugegraph-server/hugegraph-test -am -P tinkerpop-structure-test,$BACKEND -DskipCommonsTests=true fi if [[ "$SUITE" == "process" || "$SUITE" == "tinkerpop" ]]; then - mvn test -pl hugegraph-server/hugegraph-test -am -P tinkerpop-process-test,$BACKEND + mvn test -pl hugegraph-server/hugegraph-test -am -P tinkerpop-process-test,$BACKEND -DskipCommonsTests=true fi diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-unit-test.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-unit-test.sh index 5fe9b476b3..f5a6a728e7 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-unit-test.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-unit-test.sh @@ -20,5 +20,5 @@ set -ev BACKEND=$1 if [[ "$BACKEND" == "memory" ]]; then - mvn test -pl hugegraph-server/hugegraph-test -am -P unit-test + mvn test -pl hugegraph-server/hugegraph-test -am -P unit-test -DskipCommonsTests=true fi diff --git a/hugegraph-store/Dockerfile b/hugegraph-store/Dockerfile index 042ceef42f..b677da2f6b 100644 --- a/hugegraph-store/Dockerfile +++ b/hugegraph-store/Dockerfile @@ -23,7 +23,7 @@ COPY . /pkg WORKDIR /pkg ARG MAVEN_ARGS -RUN mvn package $MAVEN_ARGS -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true && pwd && ls -l && rm \ +RUN mvn package $MAVEN_ARGS -e -B -ntp -Dmaven.test.skip=true -Dmaven.javadoc.skip=true && pwd && ls -l && rm \ ./hugegraph-server/*.tar.gz && rm ./hugegraph-pd/*.tar.gz && rm ./hugegraph-store/*.tar.gz # 2nd stage: runtime env diff --git a/install-dist/scripts/dependency/known-dependencies.txt b/install-dist/scripts/dependency/known-dependencies.txt index 1bbf7241fe..9caa8ecab8 100644 --- a/install-dist/scripts/dependency/known-dependencies.txt +++ b/install-dist/scripts/dependency/known-dependencies.txt @@ -1,6 +1,7 @@ accessors-smart-1.2.jar airline-0.8.jar android-json-0.0.20131108.vaadin1.jar +animal-sniffer-annotations-1.18.jar animal-sniffer-annotations-1.19.jar annotations-13.0.jar annotations-4.1.1.4.jar @@ -25,6 +26,7 @@ assertj-core-3.19.0.jar ast-9.0-9.0.20190305.jar audience-annotations-0.5.0.jar auto-service-annotations-1.0.jar +bolt-1.6.2.jar bolt-1.6.4.jar byte-buddy-1.10.20.jar byte-buddy-1.10.5.jar @@ -104,21 +106,28 @@ groovy-jsr223-2.5.14-indy.jar groovy-swing-2.5.14.jar groovy-templates-2.5.14.jar groovy-xml-2.5.14.jar +grpc-api-1.28.1.jar grpc-api-1.39.0.jar grpc-api-1.47.0.jar +grpc-context-1.28.1.jar grpc-context-1.39.0.jar grpc-context-1.47.0.jar +grpc-core-1.28.1.jar grpc-core-1.39.0.jar grpc-core-1.47.0.jar grpc-grpclb-1.39.0.jar grpc-netty-1.39.0.jar grpc-netty-1.47.0.jar +grpc-netty-shaded-1.28.0.jar grpc-netty-shaded-1.39.0.jar grpc-netty-shaded-1.47.0.jar +grpc-protobuf-1.28.0.jar grpc-protobuf-1.39.0.jar +grpc-protobuf-lite-1.28.0.jar grpc-protobuf-lite-1.39.0.jar grpc-services-1.39.0.jar grpc-spring-boot-starter-4.5.5.jar +grpc-stub-1.28.0.jar grpc-stub-1.39.0.jar grpc-stub-1.47.0.jar gson-2.8.6.jar @@ -134,6 +143,7 @@ hbase-shaded-endpoint-2.0.6.jar HdrHistogram-2.1.12.jar HdrHistogram-2.1.9.jar hessian-3.3.6.jar +hessian-3.3.7.jar hg-pd-client-1.5.0.jar hg-pd-common-1.5.0.jar hg-pd-core-1.5.0.jar @@ -318,9 +328,11 @@ log4j-jul-2.17.2.jar log4j-slf4j-impl-2.15.0.jar log4j-slf4j-impl-2.17.0.jar log4j-slf4j-impl-2.17.1.jar +log4j-slf4j-impl-2.18.0.jar logging-interceptor-4.10.0.jar lombok-1.18.20.jar lombok-1.18.24.jar +lombok-1.18.8.jar lookout-api-1.4.1.jar lucene-analyzers-common-8.11.2.jar lucene-analyzers-smartcn-8.11.2.jar @@ -388,6 +400,7 @@ osgi-resource-locator-1.0.3.jar parboiled-core-1.2.0.jar parboiled-scala_2.12-1.2.0.jar parser-9.0-9.0.20190305.jar +perfmark-api-0.19.0.jar perfmark-api-0.23.0.jar perfmark-api-0.25.0.jar picocli-4.3.2.jar @@ -401,10 +414,12 @@ powermock-module-junit4-2.0.0-RC.3.jar powermock-module-junit4-common-2.0.0-RC.3.jar powermock-module-junit4-rule-2.0.0-RC.3.jar powermock-reflect-2.0.0-RC.3.jar +protobuf-java-3.11.0.jar protobuf-java-3.17.2.jar protobuf-java-3.21.7.jar protobuf-java-3.5.1.jar protobuf-java-util-3.17.2.jar +proto-google-common-protos-1.17.0.jar proto-google-common-protos-2.0.1.jar protostuff-api-1.6.0.jar protostuff-collectionschema-1.6.0.jar @@ -440,6 +455,7 @@ sjk-stacktrace-0.22.jar slf4j-api-1.7.21.jar slf4j-api-1.7.25.jar slf4j-api-1.7.32.jar +snakeyaml-1.18.jar snakeyaml-1.26.jar snakeyaml-1.27.jar snakeyaml-1.28.jar diff --git a/pom.xml b/pom.xml index 44be456375..004ef16909 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 1.5.0 - 1.3.0 + 1.5.0 hugegraph UTF-8 11 @@ -99,6 +99,7 @@ hugegraph-server hugegraph-pd hugegraph-store + hugegraph-commons install-dist @@ -272,6 +273,7 @@ **/*.txt **/.flattened-pom.xml + **/apache-hugegraph-*/**/*