This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch HDDS-10997 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit b493e3f3c67b7a66034bfea99f86d05145afa471 Author: Doroszlai, Attila <[email protected]> AuthorDate: Sat Jun 8 15:20:40 2024 +0200 HDDS-10997. Avoid publishing build scan for helper Maven commands --- .github/workflows/build-ratis.yml | 12 ++++++------ .github/workflows/populate-cache.yml | 2 +- dev-support/ci/download-nodejs.sh | 2 +- hadoop-ozone/dev-support/checks/acceptance.sh | 4 ++-- hadoop-ozone/dev-support/checks/blockade.sh | 2 +- hadoop-ozone/dev-support/checks/coverage.sh | 4 ++-- hadoop-ozone/dev-support/checks/junit.sh | 2 +- hadoop-ozone/dev-support/checks/kubernetes.sh | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-ratis.yml b/.github/workflows/build-ratis.yml index a6dd6b08ad..5ea673aaaa 100644 --- a/.github/workflows/build-ratis.yml +++ b/.github/workflows/build-ratis.yml @@ -84,15 +84,15 @@ jobs: - name: Get component versions id: versions run: | - thirdparty_version="$(mvn help:evaluate -N -q -DforceStdout -Dexpression=ratis.thirdparty.version)" + thirdparty_version="$(mvn help:evaluate -N -q -DforceStdout -Dscan=false -Dexpression=ratis.thirdparty.version)" echo "thirdparty=${thirdparty_version}" >> $GITHUB_OUTPUT ratis_sha=$(git rev-parse --short HEAD) - ratis_version="$(mvn help:evaluate -N -q -DforceStdout -Dexpression=project.version | sed -e "s/-SNAPSHOT/-${ratis_sha}-SNAPSHOT/")" + ratis_version="$(mvn help:evaluate -N -q -DforceStdout -Dscan=false -Dexpression=project.version | sed -e "s/-SNAPSHOT/-${ratis_sha}-SNAPSHOT/")" echo "ratis=${ratis_version}" >> $GITHUB_OUTPUT - name: Run a full build run: | - mvn versions:set -DnewVersion=${{ steps.versions.outputs.ratis }} + mvn versions:set -DnewVersion=${{ steps.versions.outputs.ratis }} -Dscan=false dev-support/checks/build.sh - name: Store Maven repo for tests uses: actions/upload-artifact@v4 @@ -119,9 +119,9 @@ jobs: - name: Get component versions id: versions run: | - echo "grpc=$(mvn help:evaluate -N -q -DforceStdout -Dexpression=shaded.grpc.version)" >> $GITHUB_OUTPUT - echo "netty=$(mvn help:evaluate -N -q -DforceStdout -Dexpression=shaded.netty.version)" >> $GITHUB_OUTPUT - echo "protobuf=$(mvn help:evaluate -N -q -DforceStdout -Dexpression=shaded.protobuf.version)" >> $GITHUB_OUTPUT + echo "grpc=$(mvn help:evaluate -N -q -DforceStdout -Dscan=false -Dexpression=shaded.grpc.version)" >> $GITHUB_OUTPUT + echo "netty=$(mvn help:evaluate -N -q -DforceStdout -Dscan=false -Dexpression=shaded.netty.version)" >> $GITHUB_OUTPUT + echo "protobuf=$(mvn help:evaluate -N -q -DforceStdout -Dscan=false -Dexpression=shaded.protobuf.version)" >> $GITHUB_OUTPUT debug: runs-on: ubuntu-20.04 needs: diff --git a/.github/workflows/populate-cache.yml b/.github/workflows/populate-cache.yml index 788418b2d7..cc93390a5b 100644 --- a/.github/workflows/populate-cache.yml +++ b/.github/workflows/populate-cache.yml @@ -56,7 +56,7 @@ jobs: - name: Get NodeJS version id: nodejs-version if: steps.restore-cache.outputs.cache-hit != 'true' - run: echo "nodejs-version=$(mvn help:evaluate -Dexpression=nodejs.version -q -DforceStdout)" >> $GITHUB_OUTPUT + run: echo "nodejs-version=$(mvn help:evaluate -Dexpression=nodejs.version -q -DforceStdout -Dscan=false)" >> $GITHUB_OUTPUT - name: Restore NodeJS tarballs id: restore-nodejs diff --git a/dev-support/ci/download-nodejs.sh b/dev-support/ci/download-nodejs.sh index 2eef8dd062..0ef1bdf26d 100755 --- a/dev-support/ci/download-nodejs.sh +++ b/dev-support/ci/download-nodejs.sh @@ -34,7 +34,7 @@ mkdir -p "${REPO_DIR}" declare -i rc=1 if [[ -z "${NODEJS_VERSION:-}" ]]; then - NODEJS_VERSION=$(mvn help:evaluate -Dexpression=nodejs.version -q -DforceStdout) + NODEJS_VERSION=$(mvn help:evaluate -Dexpression=nodejs.version -q -DforceStdout -Dscan=false) fi if [[ -n "${NODEJS_VERSION}" ]]; then diff --git a/hadoop-ozone/dev-support/checks/acceptance.sh b/hadoop-ozone/dev-support/checks/acceptance.sh index 5be3f7b587..1e16b277af 100755 --- a/hadoop-ozone/dev-support/checks/acceptance.sh +++ b/hadoop-ozone/dev-support/checks/acceptance.sh @@ -31,7 +31,7 @@ source "${DIR}/_lib.sh" REPORT_DIR=${OUTPUT_DIR:-"${OZONE_ROOT}/target/acceptance"} -OZONE_VERSION=$(mvn help:evaluate -Dexpression=ozone.version -q -DforceStdout) +OZONE_VERSION=$(mvn help:evaluate -Dexpression=ozone.version -q -DforceStdout -Dscan=false) DIST_DIR="${OZONE_ROOT}/hadoop-ozone/dist/target/ozone-$OZONE_VERSION" if [ ! -d "$DIST_DIR" ]; then @@ -45,7 +45,7 @@ if [[ "${OZONE_ACCEPTANCE_SUITE}" == "s3a" ]]; then OZONE_ACCEPTANCE_TEST_TYPE="maven" if [[ -z "${HADOOP_AWS_DIR}" ]]; then - HADOOP_VERSION=$(mvn help:evaluate -Dexpression=hadoop.version -q -DforceStdout) + HADOOP_VERSION=$(mvn help:evaluate -Dexpression=hadoop.version -q -DforceStdout -Dscan=false) export HADOOP_AWS_DIR=${OZONE_ROOT}/target/hadoop-src fi diff --git a/hadoop-ozone/dev-support/checks/blockade.sh b/hadoop-ozone/dev-support/checks/blockade.sh index 3ba41bd6ec..c8e8f49753 100755 --- a/hadoop-ozone/dev-support/checks/blockade.sh +++ b/hadoop-ozone/dev-support/checks/blockade.sh @@ -17,7 +17,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$DIR/../../.." || exit 1 -OZONE_VERSION=$(mvn help:evaluate -Dexpression=ozone.version -q -DforceStdout) +OZONE_VERSION=$(mvn help:evaluate -Dexpression=ozone.version -q -DforceStdout -Dscan=false) cd "$DIR/../../dist/target/ozone-$OZONE_VERSION/tests" || exit 1 source ${DIR}/../../dist/target/ozone-${OZONE_VERSION}/compose/ozoneblockade/.env diff --git a/hadoop-ozone/dev-support/checks/coverage.sh b/hadoop-ozone/dev-support/checks/coverage.sh index 81b0bc8169..04961921d9 100755 --- a/hadoop-ozone/dev-support/checks/coverage.sh +++ b/hadoop-ozone/dev-support/checks/coverage.sh @@ -26,10 +26,10 @@ REPORT_DIR="$DIR/../../../target/coverage" mkdir -p "$REPORT_DIR" -JACOCO_VERSION=$(mvn help:evaluate -Dexpression=jacoco.version -q -DforceStdout) +JACOCO_VERSION=$(mvn help:evaluate -Dexpression=jacoco.version -q -DforceStdout -Dscan=false) #Install jacoco cli -mvn --non-recursive --no-transfer-progress \ +mvn --non-recursive --no-transfer-progress -Dscan=false \ org.apache.maven.plugins:maven-dependency-plugin:copy \ -Dartifact=org.jacoco:org.jacoco.cli:${JACOCO_VERSION}:jar:nodeps diff --git a/hadoop-ozone/dev-support/checks/junit.sh b/hadoop-ozone/dev-support/checks/junit.sh index 422de13810..45ec12f00b 100755 --- a/hadoop-ozone/dev-support/checks/junit.sh +++ b/hadoop-ozone/dev-support/checks/junit.sh @@ -103,7 +103,7 @@ fi if [[ "${OZONE_WITH_COVERAGE}" == "true" ]]; then #Archive combined jacoco records - mvn -B -N jacoco:merge -Djacoco.destFile=$REPORT_DIR/jacoco-combined.exec + mvn -B -N jacoco:merge -Djacoco.destFile=$REPORT_DIR/jacoco-combined.exec -Dscan=false fi exit ${rc} diff --git a/hadoop-ozone/dev-support/checks/kubernetes.sh b/hadoop-ozone/dev-support/checks/kubernetes.sh index b2c44c2a2f..4f4f78e6ef 100755 --- a/hadoop-ozone/dev-support/checks/kubernetes.sh +++ b/hadoop-ozone/dev-support/checks/kubernetes.sh @@ -36,7 +36,7 @@ fi REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/kubernetes"} -OZONE_VERSION=$(mvn help:evaluate -Dexpression=ozone.version -q -DforceStdout) +OZONE_VERSION=$(mvn help:evaluate -Dexpression=ozone.version -q -DforceStdout -Dscan=false) DIST_DIR="$DIR/../../dist/target/ozone-$OZONE_VERSION" if [ ! -d "$DIST_DIR" ]; then --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
