You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2022/09/14 21:07:33 UTC
[flink] branch release-1.16 updated (b1a2a5c2d2a -> 994ef6bf23b)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch release-1.16
in repository https://gitbox.apache.org/repos/asf/flink.git
from b1a2a5c2d2a [FLINK-29285][tests] Move TestUtils#getResource
new 185c713e4b5 [hotfix][ci] Improve output when NOTICE is missing
new e9e072c41ad [FLINK-29301] loadFromResources works as jar
new 7ed8022da8e [FLINK-29301] Automatically determine modules skipping deployment
new 994ef6bf23b [FLINK-29301] Rename java-ci-tools to flink-ci-tools
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
tools/ci/{java-ci-tools => flink-ci-tools}/pom.xml | 2 +-
.../tools/ci/licensecheck/JarFileChecker.java | 0
.../tools/ci/licensecheck/LicenseChecker.java | 0
.../tools/ci/licensecheck/NoticeFileChecker.java | 87 +++++++++++++++++-----
.../tools/ci/suffixcheck/ScalaSuffixChecker.java | 0
.../ci/utils/dependency/DependencyParser.java | 0
.../flink/tools/ci/utils/shared/Dependency.java | 0
.../src/main/resources/log4j2.properties | 0
...modules-defining-excess-dependencies.modulelist | 0
.../tools/ci/licensecheck/JarFileCheckerTest.java | 0
.../utils/dependency/DependencyParserCopyTest.java | 0
.../utils/dependency/DependencyParserTreeTest.java | 0
.../org.junit.jupiter.api.extension.Extension | 0
.../modules-skipping-deployment.modulelist | 43 -----------
tools/ci/license_check.sh | 2 +-
tools/ci/verify_scala_suffixes.sh | 2 +-
17 files changed, 72 insertions(+), 66 deletions(-)
rename tools/ci/{java-ci-tools => flink-ci-tools}/pom.xml (98%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/main/java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/main/java/org/apache/flink/tools/ci/licensecheck/LicenseChecker.java (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java (80%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/main/java/org/apache/flink/tools/ci/suffixcheck/ScalaSuffixChecker.java (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/main/java/org/apache/flink/tools/ci/utils/dependency/DependencyParser.java (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/main/java/org/apache/flink/tools/ci/utils/shared/Dependency.java (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/main/resources/log4j2.properties (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/main/resources/modules-defining-excess-dependencies.modulelist (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/test/java/org/apache/flink/tools/ci/licensecheck/JarFileCheckerTest.java (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserCopyTest.java (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/test/java/org/apache/flink/tools/ci/utils/dependency/DependencyParserTreeTest.java (100%)
rename tools/ci/{java-ci-tools => flink-ci-tools}/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension (100%)
delete mode 100644 tools/ci/java-ci-tools/src/main/resources/modules-skipping-deployment.modulelist
[flink] 02/04: [FLINK-29301] loadFromResources works as jar
Posted by ch...@apache.org.
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 e9e072c41ad340ec0bffd54d7eb8a8d190263faa
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Sep 14 13:32:38 2022 +0200
[FLINK-29301] loadFromResources works as jar
loadFromResource implicitly relied on being called in the context of the java-ci-tools module, directly accessing the resources directly from the source.
When packaged as a jar this approach doesn't work, because then you'd load files from a jar filesystem that you have to create explicitly.
Instead we now load the resource as an InputStream which works in all cases.
---
.../tools/ci/licensecheck/NoticeFileChecker.java | 26 +++++++++++++++-------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java b/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java
index 719c9c6198e..8ea2cec2945 100644
--- a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java
+++ b/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java
@@ -26,11 +26,12 @@ import com.google.common.collect.Multimap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -38,6 +39,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -317,13 +319,21 @@ public class NoticeFileChecker {
private static List<String> loadFromResources(String fileName) {
try {
- Path resource = Paths.get(NoticeFileChecker.class.getResource("/" + fileName).toURI());
- List<String> result =
- Files.readAllLines(resource).stream()
- .filter(line -> !line.startsWith("#") && !line.isEmpty())
- .collect(Collectors.toList());
- LOG.debug("Loaded {} items from resource {}", result.size(), fileName);
- return result;
+ try (BufferedReader bufferedReader =
+ new BufferedReader(
+ new InputStreamReader(
+ Objects.requireNonNull(
+ NoticeFileChecker.class.getResourceAsStream(
+ "/" + fileName))))) {
+
+ List<String> result =
+ bufferedReader
+ .lines()
+ .filter(line -> !line.startsWith("#") && !line.isEmpty())
+ .collect(Collectors.toList());
+ LOG.debug("Loaded {} items from resource {}", result.size(), fileName);
+ return result;
+ }
} catch (Throwable e) {
// wrap anything in a RuntimeException to be callable from the static initializer
throw new RuntimeException("Error while loading resource", e);
[flink] 01/04: [hotfix][ci] Improve output when NOTICE is missing
Posted by ch...@apache.org.
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 185c713e4b5b499adea3b58992ee18da34cf64d3
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Sep 14 13:15:11 2022 +0200
[hotfix][ci] Improve output when NOTICE is missing
---
.../org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java b/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java
index e2f2316bd08..719c9c6198e 100644
--- a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java
+++ b/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java
@@ -129,7 +129,9 @@ public class NoticeFileChecker {
LOG.error(
"Module {} is missing a NOTICE file. It has shaded dependencies: {}",
moduleWithoutNotice,
- modulesWithShadedDependencies.get(moduleWithoutNotice));
+ modulesWithShadedDependencies.get(moduleWithoutNotice).stream()
+ .map(Dependency::toString)
+ .collect(Collectors.joining("\n\t", "\n\t", "")));
severeIssueCount++;
}
}
[flink] 03/04: [FLINK-29301] Automatically determine modules skipping deployment
Posted by ch...@apache.org.
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 7ed8022da8e782d82a33b230bd6ae204f1526ea3
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Sep 14 13:35:45 2022 +0200
[FLINK-29301] Automatically determine modules skipping deployment
In order to work with external modules we can't rely on a static list for modules that skip deployment (== where the NOTICE contents are irrelevant). We can determine that easily from the build output.
---
.../tools/ci/licensecheck/NoticeFileChecker.java | 63 +++++++++++++++++-----
.../modules-skipping-deployment.modulelist | 43 ---------------
2 files changed, 50 insertions(+), 56 deletions(-)
diff --git a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java b/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java
index 8ea2cec2945..8ba7f95c449 100644
--- a/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java
+++ b/tools/ci/java-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/NoticeFileChecker.java
@@ -37,6 +37,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -51,9 +52,6 @@ public class NoticeFileChecker {
private static final Logger LOG = LoggerFactory.getLogger(NoticeFileChecker.class);
- private static final List<String> MODULES_SKIPPING_DEPLOYMENT =
- loadFromResources("modules-skipping-deployment.modulelist");
-
private static final List<String> MODULES_DEFINING_EXCESS_DEPENDENCIES =
loadFromResources("modules-defining-excess-dependencies.modulelist");
@@ -64,6 +62,19 @@ public class NoticeFileChecker {
private static final Pattern SHADE_INCLUDE_MODULE_PATTERN =
Pattern.compile(".*Including ([^:]+):([^:]+):jar:([^ ]+) in the shaded jar");
+ // Examples:
+ //
+ // Deployment on CI with alternative repo
+ // [INFO] --- maven-deploy-plugin:2.8.2:deploy (default-deploy) @ flink-parent ---
+ // [INFO] Using alternate deployment repository.../tmp/flink-validation-deployment
+ //
+ // Skipped deployment:
+ // [INFO] --- maven-deploy-plugin:2.8.2:deploy (default-deploy) @ flink-parent ---
+ // [INFO] Skipping artifact deployment
+ private static final Pattern DEPLOY_MODULE_PATTERN =
+ Pattern.compile(
+ ".maven-deploy-plugin:.*:deploy .* @ (?<module>[^ _]+)(_[0-9.]+)? --.*");
+
// Examples:
// "- org.apache.htrace:htrace-core:3.1.0-incubating"
// or
@@ -80,13 +91,22 @@ public class NoticeFileChecker {
parseModulesFromBuildResult(buildResult),
DependencyParser.parseDependencyCopyOutput(buildResult.toPath()));
+ final Set<String> deployedModules = parseDeployedModulesFromBuildResult(buildResult);
+
LOG.info(
"Extracted "
+ + deployedModules.size()
+ + " modules that were deployed of which "
+ modulesWithBundledDependencies.keySet().size()
- + " modules with a total of "
+ + " bundle dependencies with a total of "
+ modulesWithBundledDependencies.values().size()
+ " dependencies");
+ final HashSet<String> moduleSkippingDeployment =
+ new HashSet<>(modulesWithBundledDependencies.keySet());
+ moduleSkippingDeployment.removeAll(deployedModules);
+ moduleSkippingDeployment.forEach(modulesWithBundledDependencies::removeAll);
+
// find modules producing a shaded-jar
List<Path> noticeFiles = findNoticeFiles(root);
LOG.info("Found {} NOTICE files to check", noticeFiles.size());
@@ -127,15 +147,13 @@ public class NoticeFileChecker {
.map(NoticeFileChecker::getModuleFromNoticeFile)
.collect(Collectors.toList()));
for (String moduleWithoutNotice : shadingModules) {
- if (!MODULES_SKIPPING_DEPLOYMENT.contains(moduleWithoutNotice)) {
- LOG.error(
- "Module {} is missing a NOTICE file. It has shaded dependencies: {}",
- moduleWithoutNotice,
- modulesWithShadedDependencies.get(moduleWithoutNotice).stream()
- .map(Dependency::toString)
- .collect(Collectors.joining("\n\t", "\n\t", "")));
- severeIssueCount++;
- }
+ LOG.error(
+ "Module {} is missing a NOTICE file. It has shaded dependencies: {}",
+ moduleWithoutNotice,
+ modulesWithShadedDependencies.get(moduleWithoutNotice).stream()
+ .map(Dependency::toString)
+ .collect(Collectors.joining("\n\t", "\n\t", "")));
+ severeIssueCount++;
}
return severeIssueCount;
}
@@ -317,6 +335,25 @@ public class NoticeFileChecker {
return result;
}
+ private static Set<String> parseDeployedModulesFromBuildResult(File buildResult)
+ throws IOException {
+ final Set<String> deployedModules = new HashSet<>();
+ try (Stream<String> linesStream = Files.lines(buildResult.toPath())) {
+ final Iterator<String> lines = linesStream.iterator();
+ while (lines.hasNext()) {
+ final String line = lines.next();
+ final Matcher matcher = DEPLOY_MODULE_PATTERN.matcher(line);
+ if (matcher.find()) {
+ final String module = matcher.group("module");
+ if (lines.hasNext() && !lines.next().contains("Skipping artifact deployment")) {
+ deployedModules.add(module);
+ }
+ }
+ }
+ }
+ return deployedModules;
+ }
+
private static List<String> loadFromResources(String fileName) {
try {
try (BufferedReader bufferedReader =
diff --git a/tools/ci/java-ci-tools/src/main/resources/modules-skipping-deployment.modulelist b/tools/ci/java-ci-tools/src/main/resources/modules-skipping-deployment.modulelist
deleted file mode 100644
index 7b0be584fee..00000000000
--- a/tools/ci/java-ci-tools/src/main/resources/modules-skipping-deployment.modulelist
+++ /dev/null
@@ -1,43 +0,0 @@
-################################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################
-
-# These modules are not deployed to maven central, despite their use of the shade plugin.
-
-flink-examples-streaming-gcp-pubsub
-flink-yarn-tests
-flink-docs
-flink-datastream-allround-test
-flink-queryable-state-test
-flink-confluent-schema-registry
-flink-stream-stateful-job-upgrade-test
-flink-elasticsearch7-test
-flink-stream-state-ttl-test
-flink-state-evolution-test
-flink-elasticsearch6-test
-flink-rocksdb-state-memory-control-test
-flink-python-test
-flink-streaming-kinesis-test
-flink-tpch-test
-flink-streaming-kafka-test-base
-flink-heavy-deployment-stress-test
-flink-high-parallelism-iterations-test
-flink-end-to-end-tests-common-kafka
-flink-end-to-end-tests-pulsar
-flink-end-to-end-tests-elasticsearch7
-flink-end-to-end-tests-elasticsearch6
-flink-sql-gateway-test
[flink] 04/04: [FLINK-29301] Rename java-ci-tools to flink-ci-tools
Posted by ch...@apache.org.
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 <ch...@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=$?