diff --git a/Cargo.lock b/Cargo.lock index 9995239866..589d298f0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4119,12 +4119,11 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.0" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", - "libz-rs-sys", "libz-sys", "miniz_oxide", ] @@ -6279,15 +6278,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "libz-rs-sys" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "902bc563b5d65ad9bba616b490842ef0651066a1a1dc3ce1087113ffcb873c8d" -dependencies = [ - "zlib-rs", -] - [[package]] name = "libz-sys" version = "1.1.20" @@ -6832,9 +6822,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", ] @@ -13965,12 +13955,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "zlib-rs" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b20717f0917c908dc63de2e44e97f1e6b126ca58d0e391cee86d504eb8fbd05" - [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" diff --git a/Cargo.toml b/Cargo.toml index 804ab3e0d5..cfae60a03a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -126,7 +126,6 @@ deadpool-postgres = "0.12" derive_builder = "0.12" dotenv = "0.15" etcd-client = "0.14" -flate2 = { version = "1.1.0", default-features = false, features = ["zlib-rs"] } fst = "0.4.7" futures = "0.3" futures-util = "0.3" diff --git a/tests-integration/Cargo.toml b/tests-integration/Cargo.toml index cc447a5074..f9045a2c4f 100644 --- a/tests-integration/Cargo.toml +++ b/tests-integration/Cargo.toml @@ -37,16 +37,16 @@ common-telemetry.workspace = true common-test-util.workspace = true common-time.workspace = true common-wal.workspace = true -datanode.workspace = true +datanode = { workspace = true } datatypes.workspace = true dotenv.workspace = true -flate2.workspace = true +flate2 = "1.0" flow.workspace = true frontend = { workspace = true, features = ["testing"] } futures.workspace = true futures-util.workspace = true hyper-util = { workspace = true, features = ["tokio"] } -log-query.workspace = true +log-query = { workspace = true } loki-proto.workspace = true meta-client.workspace = true meta-srv = { workspace = true, features = ["mock"] } @@ -97,5 +97,5 @@ prost.workspace = true rand.workspace = true session = { workspace = true, features = ["testing"] } store-api.workspace = true -tokio-postgres.workspace = true +tokio-postgres = { workspace = true } url = "2.3" diff --git a/tests/runner/Cargo.toml b/tests/runner/Cargo.toml index 206da82a0a..dfa28962f8 100644 --- a/tests/runner/Cargo.toml +++ b/tests/runner/Cargo.toml @@ -15,8 +15,8 @@ common-error.workspace = true common-query.workspace = true common-recordbatch.workspace = true common-time.workspace = true -datatypes.workspace = true -flate2.workspace = true +datatypes = { workspace = true } +flate2 = "1.0" hex = "0.4" local-ip-address = "0.6" mysql = { version = "25.0.1", default-features = false, features = ["minimal", "rustls-tls"] } @@ -31,5 +31,5 @@ tar = "0.4" tempfile.workspace = true tinytemplate = "1.2" tokio.workspace = true -tokio-postgres.workspace = true +tokio-postgres = { workspace = true } tokio-stream.workspace = true