This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 4bcbc7caed977b0c2c53c5b549b7feed4d430643
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Fri Aug 11 10:55:39 2023 +0200
[FLINK-32834] Remove FLINK_ROOT parameter
Ease direct manual usage by reducing the number of parameters.
---
tools/ci/compile.sh | 6 +++---
tools/ci/license_check.sh | 5 ++---
tools/ci/verify_bundled_optional.sh | 3 ---
tools/ci/verify_scala_suffixes.sh | 5 +----
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/tools/ci/compile.sh b/tools/ci/compile.sh
index 49743999707..11e1e22e9e6 100755
--- a/tools/ci/compile.sh
+++ b/tools/ci/compile.sh
@@ -97,11 +97,11 @@ fi
echo "============ Checking bundled dependencies marked as optional
============"
-${CI_DIR}/verify_bundled_optional.sh $MVN_CLEAN_COMPILE_OUT "$CI_DIR" "$(pwd)"
|| exit $?
+${CI_DIR}/verify_bundled_optional.sh $MVN_CLEAN_COMPILE_OUT "$CI_DIR" || exit
$?
echo "============ Checking scala suffixes ============"
-${CI_DIR}/verify_scala_suffixes.sh "$CI_DIR" "$(pwd)" || exit $?
+${CI_DIR}/verify_scala_suffixes.sh "$CI_DIR" || exit $?
echo "============ Checking shaded dependencies ============"
@@ -117,7 +117,7 @@ echo "============ Run license check ============"
find $MVN_VALIDATION_DIR
# We use a different Scala version with Java 17
if [[ ${PROFILE} != *"jdk17"* ]]; then
- ${CI_DIR}/license_check.sh $MVN_CLEAN_COMPILE_OUT $CI_DIR $(pwd)
$MVN_VALIDATION_DIR || exit $?
+ ${CI_DIR}/license_check.sh $MVN_CLEAN_COMPILE_OUT $CI_DIR
$MVN_VALIDATION_DIR || exit $?
fi
exit $EXIT_CODE
diff --git a/tools/ci/license_check.sh b/tools/ci/license_check.sh
index 7ba98c88eae..3b3e02603c0 100755
--- a/tools/ci/license_check.sh
+++ b/tools/ci/license_check.sh
@@ -19,12 +19,11 @@
MVN_CLEAN_COMPILE_OUT=$1
CI_DIR=$2
-FLINK_ROOT=$3
-FLINK_DEPLOYED_ROOT=$4
+FLINK_DEPLOYED_ROOT=$3
source "${CI_DIR}/maven-utils.sh"
-run_mvn -pl tools/ci/flink-ci-tools exec:java
-Dexec.mainClass=org.apache.flink.tools.ci.licensecheck.LicenseChecker
-Dexec.args="$MVN_CLEAN_COMPILE_OUT $FLINK_ROOT $FLINK_DEPLOYED_ROOT"
+run_mvn -pl tools/ci/flink-ci-tools exec:java
-Dexec.mainClass=org.apache.flink.tools.ci.licensecheck.LicenseChecker
-Dexec.args="$MVN_CLEAN_COMPILE_OUT $(pwd) $FLINK_DEPLOYED_ROOT"
EXIT_CODE=$?
if [ $EXIT_CODE != 0 ]; then
diff --git a/tools/ci/verify_bundled_optional.sh
b/tools/ci/verify_bundled_optional.sh
index d2c34e638db..bcacc705f43 100755
--- a/tools/ci/verify_bundled_optional.sh
+++ b/tools/ci/verify_bundled_optional.sh
@@ -20,12 +20,9 @@
## Checks that all bundled dependencies are marked as optional in the poms
MVN_CLEAN_COMPILE_OUT=$1
CI_DIR=$2
-FLINK_ROOT=$3
source "${CI_DIR}/maven-utils.sh"
-cd "$FLINK_ROOT" || exit
-
dependency_plugin_output=/tmp/optional_dep.txt
run_mvn dependency:tree -B > "${dependency_plugin_output}"
diff --git a/tools/ci/verify_scala_suffixes.sh
b/tools/ci/verify_scala_suffixes.sh
index b827a1c19f5..37581b472b3 100755
--- a/tools/ci/verify_scala_suffixes.sh
+++ b/tools/ci/verify_scala_suffixes.sh
@@ -38,7 +38,6 @@
# The script uses 'mvn dependency:tree -Dincludes=org.scala-lang' to list Scala
# dependent modules.
CI_DIR=$1
-FLINK_ROOT=$2
echo "--- Flink Scala Dependency Analyzer ---"
echo "Analyzing modules for Scala dependencies using 'mvn dependency:tree'."
@@ -46,8 +45,6 @@ echo "If you haven't built the project, please do so first by
running \"mvn clea
source "${CI_DIR}/maven-utils.sh"
-cd "$FLINK_ROOT" || exit
-
dependency_plugin_output=/tmp/dep.txt
run_mvn dependency:tree -Dincludes=org.scala-lang,:*_2.1*:: ${MAVEN_ARGUMENTS}
> "${dependency_plugin_output}"
@@ -61,7 +58,7 @@ if [ $EXIT_CODE != 0 ]; then
exit 1
fi
-run_mvn -pl tools/ci/flink-ci-tools exec:java exec:java
-Dexec.mainClass=org.apache.flink.tools.ci.suffixcheck.ScalaSuffixChecker
-Dexec.args="${dependency_plugin_output} ${FLINK_ROOT}"
+run_mvn -pl tools/ci/flink-ci-tools exec:java exec:java
-Dexec.mainClass=org.apache.flink.tools.ci.suffixcheck.ScalaSuffixChecker
-Dexec.args="${dependency_plugin_output} $(pwd)"
EXIT_CODE=$?
if [ $EXIT_CODE == 0 ]; then
