This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch release-1.16 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 994ef6bf23bc647843bd6f0dae7a5e43bbbfb7b4 Author: Chesnay Schepler <ches...@apache.org> AuthorDate: Wed Sep 14 14:17:24 2022 +0200 [FLINK-29301] Rename java-ci-tools to flink-ci-tools --- pom.xml | 2 +- tools/ci/{java-ci-tools => flink-ci-tools}/pom.xml | 2 +- .../java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java | 0 .../java/org/apache/flink/tools/ci/licensecheck/LicenseChecker.java | 0 .../java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java | 0 .../java/org/apache/flink/tools/ci/suffixcheck/ScalaSuffixChecker.java | 0 .../org/apache/flink/tools/ci/utils/dependency/DependencyParser.java | 0 .../main/java/org/apache/flink/tools/ci/utils/shared/Dependency.java | 0 .../src/main/resources/log4j2.properties | 0 .../src/main/resources/modules-defining-excess-dependencies.modulelist | 0 .../java/org/apache/flink/tools/ci/licensecheck/JarFileCheckerTest.java | 0 .../flink/tools/ci/utils/dependency/DependencyParserCopyTest.java | 0 .../flink/tools/ci/utils/dependency/DependencyParserTreeTest.java | 0 .../META-INF/services/org.junit.jupiter.api.extension.Extension | 0 tools/ci/license_check.sh | 2 +- tools/ci/verify_scala_suffixes.sh | 2 +- 16 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index fde290bb61f..7d3718a4884 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ under the License. <module>flink-walkthroughs</module> <module>flink-kubernetes</module> <module>flink-external-resources</module> - <module>tools/ci/java-ci-tools</module> + <module>tools/ci/flink-ci-tools</module> </modules> <properties> diff --git a/tools/ci/java-ci-tools/pom.xml b/tools/ci/flink-ci-tools/pom.xml similarity index 98% rename from tools/ci/java-ci-tools/pom.xml rename to tools/ci/flink-ci-tools/pom.xml index 5875860e5a4..34508a52e67 100644 --- a/tools/ci/java-ci-tools/pom.xml +++ b/tools/ci/flink-ci-tools/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>../../..</relativePath> </parent> - <artifactId>java-ci-tools</artifactId> + <artifactId>flink-ci-tools</artifactId> <version>1.16-SNAPSHOT</version> <name>Flink : Tools : CI : Java</name> diff --git a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java b/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java similarity index 100% rename from tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java rename to tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java diff --git a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/LicenseChecker.java b/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/LicenseChecker.java similarity index 100% rename from tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/LicenseChecker.java rename to tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/LicenseChecker.java diff --git a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java b/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java similarity index 100% rename from tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java rename to tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java diff --git a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/suffixcheck/ScalaSuffixChecker.java b/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/suffixcheck/ScalaSuffixChecker.java similarity index 100% rename from tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/suffixcheck/ScalaSuffixChecker.java rename to tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/suffixcheck/ScalaSuffixChecker.java diff --git a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/utils/dependency/DependencyParser.java b/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/utils/dependency/DependencyParser.java similarity index 100% rename from tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/utils/dependency/DependencyParser.java rename to tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/utils/dependency/DependencyParser.java diff --git a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/utils/shared/Dependency.java b/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/utils/shared/Dependency.java similarity index 100% rename from tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/utils/shared/Dependency.java rename to tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/utils/shared/Dependency.java diff --git a/tools/ci/java-ci-tools/src/main/resources/log4j2.properties b/tools/ci/flink-ci-tools/src/main/resources/log4j2.properties similarity index 100% rename from tools/ci/java-ci-tools/src/main/resources/log4j2.properties rename to tools/ci/flink-ci-tools/src/main/resources/log4j2.properties diff --git a/tools/ci/java-ci-tools/src/main/resources/modules-defining-excess-dependencies.modulelist b/tools/ci/flink-ci-tools/src/main/resources/modules-defining-excess-dependencies.modulelist similarity index 100% rename from tools/ci/java-ci-tools/src/main/resources/modules-defining-excess-dependencies.modulelist rename to tools/ci/flink-ci-tools/src/main/resources/modules-defining-excess-dependencies.modulelist diff --git a/tools/ci/java-ci-tools/src/test/java/org/apache/flink/tools/ci/licensecheck/JarFileCheckerTest.java b/tools/ci/flink-ci-tools/src/test/java/org/apache/flink/tools/ci/licensecheck/JarFileCheckerTest.java similarity index 100% rename from tools/ci/java-ci-tools/src/test/java/org/apache/flink/tools/ci/licensecheck/JarFileCheckerTest.java rename to tools/ci/flink-ci-tools/src/test/java/org/apache/flink/tools/ci/licensecheck/JarFileCheckerTest.java diff --git a/tools/ci/java-ci-tools/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserCopyTest.java b/tools/ci/flink-ci-tools/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserCopyTest.java similarity index 100% rename from tools/ci/java-ci-tools/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserCopyTest.java rename to tools/ci/flink-ci-tools/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserCopyTest.java diff --git a/tools/ci/java-ci-tools/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserTreeTest.java b/tools/ci/flink-ci-tools/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserTreeTest.java similarity index 100% rename from tools/ci/java-ci-tools/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserTreeTest.java rename to tools/ci/flink-ci-tools/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserTreeTest.java diff --git a/tools/ci/java-ci-tools/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/tools/ci/flink-ci-tools/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension similarity index 100% rename from tools/ci/java-ci-tools/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension rename to tools/ci/flink-ci-tools/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension diff --git a/tools/ci/license_check.sh b/tools/ci/license_check.sh index 34f0916e2ff..79c96416113 100755 --- a/tools/ci/license_check.sh +++ b/tools/ci/license_check.sh @@ -24,7 +24,7 @@ FLINK_DEPLOYED_ROOT=$4 source "${CI_DIR}/maven-utils.sh" -cd $CI_DIR/java-ci-tools/ +cd $CI_DIR/flink-ci-tools/ run_mvn exec:java -Dexec.mainClass=org.apache.flink.tools.ci.licensecheck.LicenseChecker -Dexec.args=\"$MVN_CLEAN_COMPILE_OUT $FLINK_ROOT $FLINK_DEPLOYED_ROOT\" EXIT_CODE=$? diff --git a/tools/ci/verify_scala_suffixes.sh b/tools/ci/verify_scala_suffixes.sh index c6189d33125..5fb3e998723 100755 --- a/tools/ci/verify_scala_suffixes.sh +++ b/tools/ci/verify_scala_suffixes.sh @@ -52,7 +52,7 @@ dependency_plugin_output=${CI_DIR}/dep.txt run_mvn dependency:tree -Dincludes=org.scala-lang,:*_2.1*:: ${MAVEN_ARGUMENTS} >> "${dependency_plugin_output}" -cd "${CI_DIR}/java-ci-tools/" || exit +cd "${CI_DIR}/flink-ci-tools/" || exit run_mvn exec:java -Dexec.mainClass=org.apache.flink.tools.ci.suffixcheck.ScalaSuffixChecker -Dexec.args=\""${dependency_plugin_output}" "${FLINK_ROOT}"\" EXIT_CODE=$?