From 88c3a1f5e7c3bbf9be92302453c7f7d515495fef Mon Sep 17 00:00:00 2001
From: "Carol (Nichols || Goulding)" <carol.nichols@gmail.com>
Date: Mon, 24 Oct 2022 14:03:55 -0400
Subject: [PATCH] feat: Use workspace dep inheritance for the arrow-flight
 crate

---
 Cargo.toml                     | 1 +
 arrow_util/Cargo.toml          | 2 +-
 influxdb_iox_client/Cargo.toml | 2 +-
 ingester/Cargo.toml            | 2 +-
 ioxd_querier/Cargo.toml        | 2 +-
 service_grpc_flight/Cargo.toml | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3d2dd60c2e..7b8b41552f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -109,6 +109,7 @@ license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
 arrow = { version = "25.0.0" }
+arrow-flight = { version = "25.0.0" }
 datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736", default-features = false }
 datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev="48f73c6af3b0cc747c38b4a9c7a610f4630e8736" }
 
diff --git a/arrow_util/Cargo.toml b/arrow_util/Cargo.toml
index 90425ff9d3..981af8f927 100644
--- a/arrow_util/Cargo.toml
+++ b/arrow_util/Cargo.toml
@@ -20,5 +20,5 @@ snafu = "0.7"
 workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
-arrow-flight = "25.0.0"
+arrow-flight = { workspace = true }
 rand = "0.8.3"
diff --git a/influxdb_iox_client/Cargo.toml b/influxdb_iox_client/Cargo.toml
index 8a0c4ae235..72b8b23787 100644
--- a/influxdb_iox_client/Cargo.toml
+++ b/influxdb_iox_client/Cargo.toml
@@ -12,7 +12,7 @@ format = ["arrow", "arrow_util"]
 
 [dependencies]
 arrow = { workspace = true, optional = true }
-arrow-flight = { version = "25.0.0", optional = true }
+arrow-flight = { workspace = true, optional = true }
 arrow_util = { path = "../arrow_util", optional = true }
 bytes = "1.2"
 client_util = { path = "../client_util" }
diff --git a/ingester/Cargo.toml b/ingester/Cargo.toml
index d1fc04e9dc..857900e923 100644
--- a/ingester/Cargo.toml
+++ b/ingester/Cargo.toml
@@ -7,7 +7,7 @@ license.workspace = true
 
 [dependencies]
 arrow = { workspace = true, features = ["prettyprint"] }
-arrow-flight = "25.0.0"
+arrow-flight = { workspace = true }
 arrow_util = { path = "../arrow_util" }
 async-trait = "0.1.58"
 backoff = { path = "../backoff" }
diff --git a/ioxd_querier/Cargo.toml b/ioxd_querier/Cargo.toml
index a873fd2d11..79f61c126d 100644
--- a/ioxd_querier/Cargo.toml
+++ b/ioxd_querier/Cargo.toml
@@ -24,7 +24,7 @@ iox_time = { path = "../iox_time" }
 trace = { path = "../trace" }
 
 # Crates.io dependencies, in alphabetical order
-arrow-flight = "25.0.0"
+arrow-flight = { workspace = true }
 async-trait = "0.1"
 hyper = "0.14"
 thiserror = "1.0.37"
diff --git a/service_grpc_flight/Cargo.toml b/service_grpc_flight/Cargo.toml
index 064d3013e3..b9ffa7a949 100644
--- a/service_grpc_flight/Cargo.toml
+++ b/service_grpc_flight/Cargo.toml
@@ -20,7 +20,7 @@ tracker = { path = "../tracker" }
 
 # Crates.io dependencies, in alphabetical order
 arrow = { workspace = true, features = ["prettyprint"] }
-arrow-flight = "25.0.0"
+arrow-flight = { workspace = true }
 bytes = "1.2"
 futures = "0.3"
 pin-project = "1.0"