From e172f3e8dc5f50700d0718ed758deec85d7fffc7 Mon Sep 17 00:00:00 2001 From: Enwei Jiao Date: Thu, 4 May 2023 19:46:38 +0800 Subject: [PATCH] Fix dependency conflict (#23847) Signed-off-by: Enwei Jiao --- internal/core/conanfile.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/core/conanfile.py b/internal/core/conanfile.py index a2f7ddc5e7..e190f85446 100644 --- a/internal/core/conanfile.py +++ b/internal/core/conanfile.py @@ -15,7 +15,11 @@ class MilvusConan(ConanFile): "lzo/2.10", "arrow/8.0.1", "openssl/1.1.1q", + "s2n/1.3.31@milvus/dev", + "aws-c-common/0.8.2@milvus/dev", + "aws-checksums/0.1.13@milvus/dev", "aws-sdk-cpp/1.9.234", + "googleapis/cci.20220711@milvus/dev", "benchmark/1.7.0", "gtest/1.8.1", "protobuf/3.21.4", @@ -35,6 +39,7 @@ class MilvusConan(ConanFile): "xsimd/9.0.1", "xz_utils/5.4.0", "prometheus-cpp/1.1.0", + "re2/20230301", "folly/2023.02.24@milvus/dev", "opentelemetry-cpp/1.8.1.1@milvus/dev", )