From 89f2f8485f8bf09b7cc683170be2513a2b5189e4 Mon Sep 17 00:00:00 2001 From: lzyxx <94185075+lzyxx77@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:58:49 +0800 Subject: [PATCH 1/7] Update LICENSE --- hugegraph-dist/release-docs/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-dist/release-docs/LICENSE b/hugegraph-dist/release-docs/LICENSE index f1cc9686c8..0e661c43a4 100644 --- a/hugegraph-dist/release-docs/LICENSE +++ b/hugegraph-dist/release-docs/LICENSE @@ -251,7 +251,7 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) * jersey-media-json-jackson (org.glassfish.jersey.media:jersey-media-json-jackson:3.0.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-json-jackson) (Apache License, Version 2.0) * ASM based accessors helper used by json-smart (net.minidev:accessors-smart:1.2 - http://www.minidev.net/) (Apache License, Version 2.0) * Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.2.4 - https://metrics.dropwizard.io/metrics-annotation) - (Apache License, Version 2.0) * Apache Cassandra (org.apache.cassandra:cassandra-all:3.11.12 - https://cassandra.apache.org) + (Apache License, Version 2.0) * Apache Cassandra (org.apache.cassandra:cassandra-all:4.0.10 - https://cassandra.apache.org) (Apache License, Version 2.0) * Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/) (Apache License, Version 2.0) * Apache Commons Codec (commons-codec:commons-codec:1.11 - http://commons.apache.org/proper/commons-codec/) (Apache License, Version 2.0) * Apache Commons Codec (commons-codec:commons-codec:1.15 - https://commons.apache.org/proper/commons-codec/) From 93c05408954b766b8b3af15676155b9ef2bd85e3 Mon Sep 17 00:00:00 2001 From: lzyxx <94185075+lzyxx77@users.noreply.github.com> Date: Fri, 27 Oct 2023 13:14:59 +0800 Subject: [PATCH 2/7] Update install-cassandra.sh --- hugegraph-dist/src/assembly/travis/install-cassandra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-dist/src/assembly/travis/install-cassandra.sh b/hugegraph-dist/src/assembly/travis/install-cassandra.sh index 367259d141..2bdfe0bf6a 100755 --- a/hugegraph-dist/src/assembly/travis/install-cassandra.sh +++ b/hugegraph-dist/src/assembly/travis/install-cassandra.sh @@ -19,7 +19,7 @@ set -ev TRAVIS_DIR=`dirname $0` CASS_DOWNLOAD_ADDRESS="http://archive.apache.org/dist/cassandra" -CASS_VERSION="3.10" +CASS_VERSION="4.0.10" CASS_PACKAGE="apache-cassandra-${CASS_VERSION}" CASS_TAR="${CASS_PACKAGE}-bin.tar.gz" CASS_CONF="${CASS_PACKAGE}/conf/cassandra.yaml" From b0f187247410cf6f151f59980a52b8ab0a28c0e5 Mon Sep 17 00:00:00 2001 From: lzy <1154132149@qq.com> Date: Thu, 23 Nov 2023 16:17:21 +0800 Subject: [PATCH 3/7] add stage profile settings --- .github/configs/settings.xml | 58 ++++++++++++++++++++++++ .github/workflows/check-dependencies.yml | 8 ++++ .github/workflows/ci.yml | 7 +++ .github/workflows/codeql-analysis.yml | 8 ++++ .github/workflows/licence-checker.yml | 8 ++++ pom.xml | 11 +++++ 6 files changed, 100 insertions(+) create mode 100644 .github/configs/settings.xml diff --git a/.github/configs/settings.xml b/.github/configs/settings.xml new file mode 100644 index 0000000000..3fcc52dea3 --- /dev/null +++ b/.github/configs/settings.xml @@ -0,0 +1,58 @@ + + + + + + github + ${env.GITHUB_ACTOR} + ${env.GITHUB_TOKEN} + + + + + + local-repo + + + central + https://repo.maven.apache.org/maven2 + + true + + + false + + + + staged-releases + https://repository.apache.org/content/groups/staging/ + + + + + staged-releases + https://repository.apache.org/content/groups/staging/ + + + + + + + local-repo + + diff --git a/.github/workflows/check-dependencies.yml b/.github/workflows/check-dependencies.yml index fa28483a9d..119d55bb52 100644 --- a/.github/workflows/check-dependencies.yml +++ b/.github/workflows/check-dependencies.yml @@ -13,6 +13,7 @@ jobs: dependency-check: runs-on: ubuntu-latest env: + USE_STAGE: 'true' # Whether to include the stage repository. SCRIPT_DEPENDENCY: hugegraph-server/hugegraph-dist/scripts/dependency steps: - name: Checkout source @@ -22,6 +23,13 @@ jobs: with: java-version: '11' distribution: 'adopt' + + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: mvn install run: | mvn install -DskipTests=true -ntp diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 670831aa03..5bb3cd5cdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,7 @@ jobs: build: runs-on: ubuntu-20.04 env: + 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 }} @@ -34,6 +35,12 @@ jobs: java-version: ${{ matrix.JAVA_VERSION }} distribution: 'zulu' + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: Cache Maven packages uses: actions/cache@v3 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a8e40be83a..958e5b1bdc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -11,6 +11,8 @@ on: jobs: analyze: + env: + USE_STAGE: 'true' # Whether to include the stage repository. name: Analyze runs-on: ubuntu-latest permissions: @@ -33,6 +35,12 @@ jobs: distribution: 'zulu' java-version: '11' + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/licence-checker.yml b/.github/workflows/licence-checker.yml index 163e59e1de..2455581d8c 100644 --- a/.github/workflows/licence-checker.yml +++ b/.github/workflows/licence-checker.yml @@ -10,6 +10,8 @@ on: jobs: check-license: runs-on: ubuntu-latest + env: + USE_STAGE: 'true' # Whether to include the stage repository. steps: - uses: actions/checkout@v3 @@ -27,6 +29,12 @@ jobs: java-version: '11' distribution: 'adopt' + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: License check(RAT) run: | mvn apache-rat:check -ntp diff --git a/pom.xml b/pom.xml index 308d2ff754..f5e44e42dd 100644 --- a/pom.xml +++ b/pom.xml @@ -269,5 +269,16 @@ + + + + stage + + + staged-releases + https://repository.apache.org/content/groups/staging/ + + + From fc882e66dc22008e8a443e05f642512b1ab969ef Mon Sep 17 00:00:00 2001 From: lzyxx <94185075+lzyxx77@users.noreply.github.com> Date: Thu, 23 Nov 2023 16:41:13 +0800 Subject: [PATCH 4/7] Update ci.yml --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5bb3cd5cdf..35a8304e5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,12 +35,6 @@ jobs: java-version: ${{ matrix.JAVA_VERSION }} distribution: 'zulu' - - name: use staged maven repo settings - if: ${{ env.USE_STAGE == 'true' }} - run: | - cp $HOME/.m2/settings.xml /tmp/settings.xml - mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - - name: Cache Maven packages uses: actions/cache@v3 with: @@ -52,6 +46,12 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 2 + + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - name: Compile run: | From b567bcd785a18cd16499c116f7819b098b0e1207 Mon Sep 17 00:00:00 2001 From: lzyxx <94185075+lzyxx77@users.noreply.github.com> Date: Thu, 23 Nov 2023 16:45:29 +0800 Subject: [PATCH 5/7] Update ci.yml --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35a8304e5a..670831aa03 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,6 @@ jobs: build: runs-on: ubuntu-20.04 env: - 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 }} @@ -46,12 +45,6 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 2 - - - name: use staged maven repo settings - if: ${{ env.USE_STAGE == 'true' }} - run: | - cp $HOME/.m2/settings.xml /tmp/settings.xml - mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - name: Compile run: | From 83b604ef8a2e56560e80a4be53bd740cd1f67e9c Mon Sep 17 00:00:00 2001 From: lzyxx <94185075+lzyxx77@users.noreply.github.com> Date: Thu, 23 Nov 2023 19:19:07 +0800 Subject: [PATCH 6/7] Update ci.yml --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 670831aa03..ca783e391e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,7 @@ jobs: build: runs-on: ubuntu-20.04 env: + 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 }} @@ -65,6 +66,12 @@ jobs: java-version: ${{ matrix.JAVA_VERSION }} distribution: 'zulu' + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: Run unit test run: | $TRAVIS_DIR/run-unit-test.sh $BACKEND From 95bc3fbf4fedd4e23ced6c4cc04e53fb82a94021 Mon Sep 17 00:00:00 2001 From: imbajin Date: Thu, 23 Nov 2023 20:18:11 +0800 Subject: [PATCH 7/7] Update licence-checker.yml --- .github/workflows/licence-checker.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/licence-checker.yml b/.github/workflows/licence-checker.yml index 2455581d8c..3d14cc0620 100644 --- a/.github/workflows/licence-checker.yml +++ b/.github/workflows/licence-checker.yml @@ -10,10 +10,8 @@ on: jobs: check-license: runs-on: ubuntu-latest - env: - USE_STAGE: 'true' # Whether to include the stage repository. steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check License Header uses: apache/skywalking-eyes@main @@ -24,17 +22,6 @@ jobs: token: ${{ github.token }} config: .licenserc.yaml - - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'adopt' - - - name: use staged maven repo settings - if: ${{ env.USE_STAGE == 'true' }} - run: | - cp $HOME/.m2/settings.xml /tmp/settings.xml - mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - - name: License check(RAT) run: | mvn apache-rat:check -ntp