From a89b52aee9dd0956e4f18296f74c11ea3ca03586 Mon Sep 17 00:00:00 2001
From: slfan1989 <slfan1989@apache.org>
Date: Tue, 10 Feb 2026 09:44:01 +0800
Subject: [PATCH] [AURON #1996] Standardize Cargo workspace edition and
 resolver configuration.

Signed-off-by: slfan1989 <slfan1989@apache.org>
---
 Cargo.toml                                        | 4 ++++
 native-engine/auron-jni-bridge/Cargo.toml         | 3 +--
 native-engine/auron-memmgr/Cargo.toml             | 2 +-
 native-engine/auron-planner/Cargo.toml            | 2 +-
 native-engine/auron/Cargo.toml                    | 3 +--
 native-engine/datafusion-ext-commons/Cargo.toml   | 3 +--
 native-engine/datafusion-ext-exprs/Cargo.toml     | 3 +--
 native-engine/datafusion-ext-functions/Cargo.toml | 3 +--
 native-engine/datafusion-ext-plans/Cargo.toml     | 3 +--
 9 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 126597140..aba08aad2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,7 @@
 #
 
 [workspace]
+resolver = "2"
 members = [
     "native-engine/datafusion-ext-commons",
     "native-engine/datafusion-ext-exprs",
@@ -27,6 +28,9 @@ members = [
     "native-engine/auron-memmgr",
 ]
 
+[workspace.package]
+edition = "2024"
+
 [workspace.lints.rust]
 # Pending processing (temporarily allow)
 unused_variables = "allow"
diff --git a/native-engine/auron-jni-bridge/Cargo.toml b/native-engine/auron-jni-bridge/Cargo.toml
index fbbbf4a22..77a6297e3 100644
--- a/native-engine/auron-jni-bridge/Cargo.toml
+++ b/native-engine/auron-jni-bridge/Cargo.toml
@@ -18,8 +18,7 @@
 [package]
 name = "auron-jni-bridge"
 version = "0.1.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
 
 [lints]
 workspace = true
diff --git a/native-engine/auron-memmgr/Cargo.toml b/native-engine/auron-memmgr/Cargo.toml
index 8b09480e0..12ae34c41 100644
--- a/native-engine/auron-memmgr/Cargo.toml
+++ b/native-engine/auron-memmgr/Cargo.toml
@@ -18,7 +18,7 @@
 [package]
 name = "auron-memmgr"
 version = "0.1.0"
-edition = "2024"
+edition.workspace = true
 
 [lints]
 workspace = true
diff --git a/native-engine/auron-planner/Cargo.toml b/native-engine/auron-planner/Cargo.toml
index a052f429e..d79ea9823 100644
--- a/native-engine/auron-planner/Cargo.toml
+++ b/native-engine/auron-planner/Cargo.toml
@@ -18,7 +18,7 @@
 [package]
 name = "auron-planner"
 version = "0.1.0"
-edition = "2024"
+edition.workspace = true
 
 [lints]
 workspace = true
diff --git a/native-engine/auron/Cargo.toml b/native-engine/auron/Cargo.toml
index 9111318d5..1a4510ee4 100644
--- a/native-engine/auron/Cargo.toml
+++ b/native-engine/auron/Cargo.toml
@@ -18,8 +18,7 @@
 [package]
 name = "auron"
 version = "0.1.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
 
 [lints]
 workspace = true
diff --git a/native-engine/datafusion-ext-commons/Cargo.toml b/native-engine/datafusion-ext-commons/Cargo.toml
index 3bf788dad..0b6ed3f7a 100644
--- a/native-engine/datafusion-ext-commons/Cargo.toml
+++ b/native-engine/datafusion-ext-commons/Cargo.toml
@@ -18,8 +18,7 @@
 [package]
 name = "datafusion-ext-commons"
 version = "0.1.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
 
 [lints]
 workspace = true
diff --git a/native-engine/datafusion-ext-exprs/Cargo.toml b/native-engine/datafusion-ext-exprs/Cargo.toml
index 961c54b7e..0de2121cf 100644
--- a/native-engine/datafusion-ext-exprs/Cargo.toml
+++ b/native-engine/datafusion-ext-exprs/Cargo.toml
@@ -18,8 +18,7 @@
 [package]
 name = "datafusion-ext-exprs"
 version = "0.1.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
 
 [lints]
 workspace = true
diff --git a/native-engine/datafusion-ext-functions/Cargo.toml b/native-engine/datafusion-ext-functions/Cargo.toml
index 4ac5e4403..e64fb79da 100644
--- a/native-engine/datafusion-ext-functions/Cargo.toml
+++ b/native-engine/datafusion-ext-functions/Cargo.toml
@@ -18,8 +18,7 @@
 [package]
 name = "datafusion-ext-functions"
 version = "0.1.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
 
 [lints]
 workspace = true
diff --git a/native-engine/datafusion-ext-plans/Cargo.toml b/native-engine/datafusion-ext-plans/Cargo.toml
index d3f86eb67..0e683c61a 100644
--- a/native-engine/datafusion-ext-plans/Cargo.toml
+++ b/native-engine/datafusion-ext-plans/Cargo.toml
@@ -18,8 +18,7 @@
 [package]
 name = "datafusion-ext-plans"
 version = "0.1.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
 
 [lints]
 workspace = true