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 86ca674fbb9efcdc05a81c201772bc97e958a94c Author: Chesnay Schepler <[email protected]> AuthorDate: Mon Nov 14 14:42:51 2022 +0100 [hotfix][ci] Include classifier in equals/hashCode/toString --- .../main/java/org/apache/flink/tools/ci/utils/shared/Dependency.java | 4 +++- .../flink/tools/ci/utils/dependency/DependencyParserTreeTest.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ci/flink-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 index 78417efff7c..74d9181a478 100644 --- a/tools/ci/flink-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 @@ -105,6 +105,7 @@ public final class Dependency { + artifactId + ":" + version + + (classifier != null ? ":" + classifier : "") + (scope != null ? ":" + scope : "") + (isOptional != null && isOptional ? " (optional)" : ""); } @@ -121,12 +122,13 @@ public final class Dependency { return Objects.equals(groupId, that.groupId) && Objects.equals(artifactId, that.artifactId) && Objects.equals(version, that.version) + && Objects.equals(classifier, that.classifier) && Objects.equals(scope, that.scope) && Objects.equals(isOptional, that.isOptional); } @Override public int hashCode() { - return Objects.hash(groupId, artifactId, version, scope, isOptional); + return Objects.hash(groupId, artifactId, version, classifier, scope, isOptional); } } diff --git a/tools/ci/flink-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 index 260c4c60ace..78eb12f6f43 100644 --- a/tools/ci/flink-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 @@ -37,7 +37,7 @@ class DependencyParserTreeTest { "[INFO] +- external:dependency1:jar:2.1:compile", "[INFO] | +- external:dependency2:jar:2.2:compile (optional)", "[INFO] | | \\- external:dependency3:jar:2.3:provided", - "[INFO] | +- external:dependency4:classifier:jar:2.4:compile", + "[INFO] | +- external:dependency4:jar:classifier:2.4:compile", "[INFO]", "[INFO] --- maven-dependency-plugin:3.2.0:tree (default-cli) @ m2 ---", "[INFO] internal:m2:jar:1.2",
