diff --git a/.github/actions/setup-java-with-cache/action.yml b/.github/actions/setup-java-with-cache/action.yml index ae0c99538c6..39d119bc81d 100644 --- a/.github/actions/setup-java-with-cache/action.yml +++ b/.github/actions/setup-java-with-cache/action.yml @@ -53,6 +53,7 @@ runs: with: distribution: 'temurin' java-version: ${{ inputs.java-version }} + show-download-progress: true - name: Calculate cache key id: cache-key diff --git a/hadoop-ozone/dev-support/checks/_build.sh b/hadoop-ozone/dev-support/checks/_build.sh index 3665237b443..5b97b11cd9c 100755 --- a/hadoop-ozone/dev-support/checks/_build.sh +++ b/hadoop-ozone/dev-support/checks/_build.sh @@ -27,7 +27,7 @@ BASE_DIR="$(pwd -P)" REPORT_DIR=${OUTPUT_DIR:-"${BASE_DIR}/target/${CHECK}"} REPORT_FILE="$REPORT_DIR/summary.txt" -MAVEN_OPTIONS='-V -B -DskipTests --no-transfer-progress' +MAVEN_OPTIONS='-V -B -DskipTests' MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dscan.value.check=${CHECK}" if [[ "${OZONE_WITH_COVERAGE}" == "true" ]]; then diff --git a/hadoop-ozone/dev-support/checks/_lib.sh b/hadoop-ozone/dev-support/checks/_lib.sh index 0d50b2f6a74..209505d2325 100644 --- a/hadoop-ozone/dev-support/checks/_lib.sh +++ b/hadoop-ozone/dev-support/checks/_lib.sh @@ -99,5 +99,14 @@ create_aws_dir() { get_version() { local dep="$1" shift - MVNW_VERBOSE=false ./mvnw --non-recursive --quiet help:evaluate -Dexpression="${dep}.version" -DforceStdout -Dscan=false "$@" + + if [[ "${CI:-}" == "true" ]]; then + # output version/transfer etc. to stderr first + ./mvnw --batch-mode --non-recursive --show-version \ + help:evaluate -Dexpression="${dep}.version" -Dscan=false "$@" >&2 + fi + + # now print only the version to stdout + MVNW_VERBOSE=false ./mvnw --non-recursive --no-transfer-progress --quiet \ + help:evaluate -Dexpression="${dep}.version" -DforceStdout -Dscan=false "$@" } diff --git a/hadoop-ozone/dev-support/checks/checkstyle.sh b/hadoop-ozone/dev-support/checks/checkstyle.sh index 95dc83ca851..637f4080584 100755 --- a/hadoop-ozone/dev-support/checks/checkstyle.sh +++ b/hadoop-ozone/dev-support/checks/checkstyle.sh @@ -26,7 +26,7 @@ REPORT_DIR=${OUTPUT_DIR:-"${BASE_DIR}/target/${CHECK}"} mkdir -p "$REPORT_DIR" REPORT_FILE="$REPORT_DIR/summary.txt" -MAVEN_OPTIONS='-B -fae -DskipRecon -Dcheckstyle.failOnViolation=false --no-transfer-progress' +MAVEN_OPTIONS='-B -fae -DskipRecon -Dcheckstyle.failOnViolation=false' MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dscan.value.check=${CHECK}" declare -i rc diff --git a/hadoop-ozone/dev-support/checks/coverage.sh b/hadoop-ozone/dev-support/checks/coverage.sh index 86a495cd7e7..c858483f2a2 100755 --- a/hadoop-ozone/dev-support/checks/coverage.sh +++ b/hadoop-ozone/dev-support/checks/coverage.sh @@ -30,7 +30,7 @@ source "${DIR}/_lib.sh" JACOCO_VERSION=$(get_version jacoco) #Install jacoco cli -./mvnw --non-recursive --no-transfer-progress -Dscan=false \ +./mvnw --non-recursive -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/errorprone.sh b/hadoop-ozone/dev-support/checks/errorprone.sh index b37ac39e48a..0506b07c35c 100755 --- a/hadoop-ozone/dev-support/checks/errorprone.sh +++ b/hadoop-ozone/dev-support/checks/errorprone.sh @@ -27,7 +27,7 @@ BASE_DIR="$(pwd -P)" REPORT_DIR=${OUTPUT_DIR:-"${BASE_DIR}/target/${CHECK}"} OUTPUT_LOG=$(mktemp) -MAVEN_OPTIONS='-B -fae --no-transfer-progress -Perrorprone -DskipRecon -DskipShade -DskipTests' +MAVEN_OPTIONS='-B -fae -Perrorprone -DskipRecon -DskipShade -DskipTests' MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dscan.value.check=${CHECK}" # timestamp prefix breaks diagnostic patterns diff --git a/hadoop-ozone/dev-support/checks/findbugs.sh b/hadoop-ozone/dev-support/checks/findbugs.sh index 66004575438..1c2d69d5173 100755 --- a/hadoop-ozone/dev-support/checks/findbugs.sh +++ b/hadoop-ozone/dev-support/checks/findbugs.sh @@ -33,7 +33,7 @@ REPORT_FILE="$REPORT_DIR/summary.txt" source "${DIR}/_lib.sh" source "${DIR}/install/spotbugs.sh" -MAVEN_OPTIONS='-B -fae -DskipRecon -DskipShade --no-transfer-progress' +MAVEN_OPTIONS='-B -fae -DskipRecon -DskipShade' MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dscan.value.check=${CHECK}" if [[ "${OZONE_WITH_COVERAGE}" != "true" ]]; then diff --git a/hadoop-ozone/dev-support/checks/javadoc.sh b/hadoop-ozone/dev-support/checks/javadoc.sh index 2d69398f9b6..74cfb0a101d 100755 --- a/hadoop-ozone/dev-support/checks/javadoc.sh +++ b/hadoop-ozone/dev-support/checks/javadoc.sh @@ -25,7 +25,7 @@ BASE_DIR="$(pwd -P)" REPORT_DIR=${OUTPUT_DIR:-"${BASE_DIR}/target/${CHECK}"} REPORT_FILE="$REPORT_DIR/summary.txt" -MAVEN_OPTIONS="-B -fae -Djacoco.skip -DskipRecon -DskipShade --no-transfer-progress ${MAVEN_OPTIONS:-}" +MAVEN_OPTIONS="-B -fae -Djacoco.skip -DskipRecon -DskipShade ${MAVEN_OPTIONS:-}" MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dscan.value.check=${CHECK}" log=$(mktemp) diff --git a/hadoop-ozone/dev-support/checks/junit.sh b/hadoop-ozone/dev-support/checks/junit.sh index 9da46513a93..b0086f2fa84 100755 --- a/hadoop-ozone/dev-support/checks/junit.sh +++ b/hadoop-ozone/dev-support/checks/junit.sh @@ -36,7 +36,7 @@ if [[ ${ITERATIONS} -le 0 ]]; then fi export MAVEN_OPTS="-Xmx4096m ${MAVEN_OPTS:-}" -MAVEN_OPTIONS="-B -V -DskipRecon -Dnative.lib.tmp.dir=/tmp --no-transfer-progress" +MAVEN_OPTIONS="-B -V -DskipRecon -Dnative.lib.tmp.dir=/tmp" MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dscan.value.check=${CHECK}" if [[ "${OZONE_WITH_COVERAGE}" != "true" ]]; then diff --git a/hadoop-ozone/dev-support/checks/license.sh b/hadoop-ozone/dev-support/checks/license.sh index 5ba58c3c895..0169a45d755 100755 --- a/hadoop-ozone/dev-support/checks/license.sh +++ b/hadoop-ozone/dev-support/checks/license.sh @@ -45,7 +45,7 @@ DEFAULT_SRC="target/generated-sources/license/THIRD-PARTY.txt" src="${1:-${DEFAULT_SRC}}" if [[ ! -e ${src} ]]; then - MAVEN_OPTIONS="-B -fae -DskipRecon --no-transfer-progress ${MAVEN_OPTIONS:-}" + MAVEN_OPTIONS="-B -fae -DskipRecon ${MAVEN_OPTIONS:-}" ./mvnw ${MAVEN_OPTIONS} license:aggregate-add-third-party | tee "${REPORT_DIR}/output.log" src="${DEFAULT_SRC}" fi diff --git a/hadoop-ozone/dev-support/checks/pmd.sh b/hadoop-ozone/dev-support/checks/pmd.sh index 062a64bf169..249a73d6497 100755 --- a/hadoop-ozone/dev-support/checks/pmd.sh +++ b/hadoop-ozone/dev-support/checks/pmd.sh @@ -29,7 +29,7 @@ mkdir -p "$REPORT_DIR" REPORT_FILE="$REPORT_DIR/summary.txt" -MAVEN_OPTIONS='-B -fae --no-transfer-progress -Dpmd.failOnViolation=false -Dpmd.printFailingErrors -DskipRecon -DskipShade' +MAVEN_OPTIONS='-B -fae -Dpmd.failOnViolation=false -Dpmd.printFailingErrors -DskipRecon -DskipShade' MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dscan.value.check=${CHECK}" declare -i rc diff --git a/hadoop-ozone/dev-support/checks/rat.sh b/hadoop-ozone/dev-support/checks/rat.sh index 304df78117b..3b5cf364244 100755 --- a/hadoop-ozone/dev-support/checks/rat.sh +++ b/hadoop-ozone/dev-support/checks/rat.sh @@ -29,7 +29,7 @@ mkdir -p "$REPORT_DIR" REPORT_FILE="$REPORT_DIR/summary.txt" -./mvnw -B --no-transfer-progress -fn org.apache.rat:apache-rat-plugin:check "$@" \ +./mvnw -B -fn org.apache.rat:apache-rat-plugin:check "$@" \ | tee "${REPORT_DIR}/output.log" rc=$? diff --git a/hadoop-ozone/dev-support/checks/sonar.sh b/hadoop-ozone/dev-support/checks/sonar.sh index ec6c145c745..1d778ee878e 100755 --- a/hadoop-ozone/dev-support/checks/sonar.sh +++ b/hadoop-ozone/dev-support/checks/sonar.sh @@ -25,6 +25,6 @@ fi : "${SONAR_MAVEN_PLUGIN_VERSION:=5.1.0.4751}" -./mvnw -V -B -DskipShade -DskipTests -DskipRecon --no-transfer-progress \ +./mvnw -V -B -DskipShade -DskipTests -DskipRecon \ -Dsonar.coverage.jacoco.xmlReportPaths="$(pwd)/target/coverage/all.xml" \ verify "org.sonarsource.scanner.maven:sonar-maven-plugin:${SONAR_MAVEN_PLUGIN_VERSION}:sonar"