This is an automated email from the ASF dual-hosted git repository.
lihao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/auron.git
The following commit(s) were added to refs/heads/master by this push:
new b2b04cda [AURON #2026] Migrate from deprecated JavaConverters to
CollectionConverters. (#2027)
b2b04cda is described below
commit b2b04cdacf3b6894d67375eeaa66dd1f1c7218a2
Author: slfan1989 <[email protected]>
AuthorDate: Tue Mar 3 11:30:52 2026 +0800
[AURON #2026] Migrate from deprecated JavaConverters to
CollectionConverters. (#2027)
### Which issue does this PR close?
Closes #2026
### Rationale for this change
The codebase currently uses the deprecated
`scala.collection.JavaConverters` API for Java-Scala collection
conversions. This API was deprecated in Scala 2.13 in favor of
`scala.jdk.CollectionConverters`.
Current issues:
- Deprecation warnings are being suppressed in build configuration
(pom.xml:1055)
- Using outdated API that doesn't follow Scala best practices
- Potential migration barrier when upgrading to Scala 2.13+
The project already includes `scala-collection-compat` dependency
(version 2.12.0), which provides a compatibility layer allowing the use
of modern `scala.jdk.CollectionConverters` API in Scala 2.12 without any
behavioral changes.
### What changes are included in this PR?
**How this works with Scala 2.12:**
The `scala-collection-compat` library provides a compatibility layer
that:
- In Scala 2.12: redirects `scala.jdk.CollectionConverters` to
`scala.collection.JavaConverters`
- In Scala 2.13+: uses native `scala.jdk.CollectionConverters`
This ensures zero runtime behavioral changes.
### Are there any user-facing changes?
No. This is purely an internal code refactoring with no user-facing
changes or behavioral differences.
### How was this patch tested?
Existing unit tests pass.
Signed-off-by: slfan1989 <[email protected]>
---
.../scala/org/apache/auron/utils/SparkTestSettings.scala | 2 +-
.../scala/org/apache/spark/sql/SparkQueryTestsBase.scala | 2 +-
pom.xml | 16 ++++++++++++++++
.../scala/org/apache/auron/metric/SparkMetricNode.scala | 2 +-
.../org/apache/spark/sql/auron/AuronConverters.scala | 2 +-
.../org/apache/spark/sql/auron/NativeConverters.scala | 2 +-
.../sql/execution/auron/arrowio/util/ArrowUtils.scala | 3 +--
.../sql/execution/auron/arrowio/util/ArrowWriter.scala | 2 +-
.../sql/execution/auron/columnar/ColumnarHelper.scala | 2 +-
.../spark/sql/execution/auron/plan/NativeAggBase.scala | 2 +-
.../auron/plan/NativeBroadcastExchangeBase.scala | 2 +-
.../execution/auron/plan/NativeBroadcastJoinBase.scala | 2 +-
.../sql/execution/auron/plan/NativeExpandBase.scala | 2 +-
.../execution/auron/plan/NativeFileSourceScanBase.scala | 2 +-
.../sql/execution/auron/plan/NativeFilterBase.scala | 2 +-
.../sql/execution/auron/plan/NativeGenerateBase.scala | 2 +-
.../sql/execution/auron/plan/NativeOrcScanBase.scala | 2 +-
.../sql/execution/auron/plan/NativeParquetScanBase.scala | 2 +-
.../sql/execution/auron/plan/NativeParquetSinkBase.scala | 2 +-
.../sql/execution/auron/plan/NativeProjectBase.scala | 2 +-
.../execution/auron/plan/NativeRenameColumnsBase.scala | 2 +-
.../execution/auron/plan/NativeShuffleExchangeBase.scala | 2 +-
.../auron/plan/NativeShuffledHashJoinBase.scala | 2 +-
.../spark/sql/execution/auron/plan/NativeSortBase.scala | 2 +-
.../execution/auron/plan/NativeSortMergeJoinBase.scala | 2 +-
.../sql/execution/auron/plan/NativeTakeOrderedBase.scala | 2 +-
.../spark/sql/execution/auron/plan/NativeUnionBase.scala | 2 +-
.../sql/execution/auron/plan/NativeWindowBase.scala | 2 +-
.../execution/auron/plan/NativeHiveTableScanBase.scala | 2 +-
.../execution/auron/plan/NativePaimonTableScanExec.scala | 2 +-
.../shuffle/uniffle/AuronUniffleShuffleReader.scala | 2 +-
31 files changed, 46 insertions(+), 31 deletions(-)
diff --git
a/auron-spark-tests/common/src/test/scala/org/apache/auron/utils/SparkTestSettings.scala
b/auron-spark-tests/common/src/test/scala/org/apache/auron/utils/SparkTestSettings.scala
index 5ca56c12..3822493a 100644
---
a/auron-spark-tests/common/src/test/scala/org/apache/auron/utils/SparkTestSettings.scala
+++
b/auron-spark-tests/common/src/test/scala/org/apache/auron/utils/SparkTestSettings.scala
@@ -18,7 +18,7 @@ package org.apache.auron.utils
import java.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import scala.reflect.ClassTag
/**
diff --git
a/auron-spark-tests/common/src/test/scala/org/apache/spark/sql/SparkQueryTestsBase.scala
b/auron-spark-tests/common/src/test/scala/org/apache/spark/sql/SparkQueryTestsBase.scala
index 8498edcd..159cb617 100644
---
a/auron-spark-tests/common/src/test/scala/org/apache/spark/sql/SparkQueryTestsBase.scala
+++
b/auron-spark-tests/common/src/test/scala/org/apache/spark/sql/SparkQueryTestsBase.scala
@@ -19,7 +19,7 @@ package org.apache.spark.sql
import java.io.File
import java.util.TimeZone
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.commons.io.FileUtils
import org.apache.commons.math3.util.Precision
diff --git a/pom.xml b/pom.xml
index 27489c0b..d8600003 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
<scalaLongVersion>2.12.18</scalaLongVersion>
<scala-xml.version>2.1.0</scala-xml.version>
<scalaJava8CompatVersion>1.0.2</scalaJava8CompatVersion>
+ <scalaCollectionCompatVersion>2.12.0</scalaCollectionCompatVersion>
<maven.version>3.9.12</maven.version>
<maven.plugin.scala.version>4.9.2</maven.plugin.scala.version>
<maven.plugin.scalatest.version>2.2.0</maven.plugin.scalatest.version>
@@ -132,6 +133,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-collection-compat_${scalaVersion}</artifactId>
+ <version>${scalaCollectionCompatVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scalaVersion}</artifactId>
@@ -301,6 +313,10 @@
<artifactId>scala-reflect</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-collection-compat_${scalaVersion}</artifactId>
+ </dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scalaVersion}</artifactId>
diff --git
a/spark-extension/src/main/scala/org/apache/auron/metric/SparkMetricNode.scala
b/spark-extension/src/main/scala/org/apache/auron/metric/SparkMetricNode.scala
index 8c3925ae..81296347 100644
---
a/spark-extension/src/main/scala/org/apache/auron/metric/SparkMetricNode.scala
+++
b/spark-extension/src/main/scala/org/apache/auron/metric/SparkMetricNode.scala
@@ -16,7 +16,7 @@
*/
package org.apache.auron.metric
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.spark.internal.Logging
import org.apache.spark.sql.execution.metric.SQLMetric
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/auron/AuronConverters.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/auron/AuronConverters.scala
index def645d5..d01c8271 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/auron/AuronConverters.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/auron/AuronConverters.scala
@@ -19,8 +19,8 @@ package org.apache.spark.sql.auron
import java.util.ServiceLoader
import scala.annotation.tailrec
-import scala.collection.JavaConverters._
import scala.collection.mutable
+import scala.jdk.CollectionConverters._
import org.apache.commons.lang3.reflect.MethodUtils
import org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/auron/NativeConverters.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/auron/NativeConverters.scala
index 7a3bde2c..5bc9302f 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/auron/NativeConverters.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/auron/NativeConverters.scala
@@ -21,8 +21,8 @@ import java.io.ByteArrayOutputStream
import java.io.ObjectInputStream
import java.io.ObjectOutputStream
-import scala.collection.JavaConverters._
import scala.collection.mutable
+import scala.jdk.CollectionConverters._
import scala.math.max
import scala.math.min
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/arrowio/util/ArrowUtils.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/arrowio/util/ArrowUtils.scala
index 242f9a61..12e8c9bf 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/arrowio/util/ArrowUtils.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/arrowio/util/ArrowUtils.scala
@@ -16,8 +16,7 @@
*/
package org.apache.spark.sql.execution.auron.arrowio.util
-import scala.collection.JavaConverters.asScalaBufferConverter
-import scala.collection.JavaConverters.seqAsJavaListConverter
+import scala.jdk.CollectionConverters._
import org.apache.arrow.memory.BufferAllocator
import org.apache.arrow.memory.RootAllocator
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/arrowio/util/ArrowWriter.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/arrowio/util/ArrowWriter.scala
index d0f0eeb6..a9ff8891 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/arrowio/util/ArrowWriter.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/arrowio/util/ArrowWriter.scala
@@ -16,7 +16,7 @@
*/
package org.apache.spark.sql.execution.auron.arrowio.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.arrow.vector._
import org.apache.arrow.vector.complex._
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/columnar/ColumnarHelper.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/columnar/ColumnarHelper.scala
index 82fef3b6..d54caed2 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/columnar/ColumnarHelper.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/columnar/ColumnarHelper.scala
@@ -16,7 +16,7 @@
*/
package org.apache.spark.sql.execution.auron.columnar
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.arrow.vector.VectorSchemaRoot
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeAggBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeAggBase.scala
index 6c510c0b..6613791f 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeAggBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeAggBase.scala
@@ -17,8 +17,8 @@
package org.apache.spark.sql.execution.auron.plan
import scala.annotation.tailrec
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.internal.Logging
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastExchangeBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastExchangeBase.scala
index f3fb5f25..9152218a 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastExchangeBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastExchangeBase.scala
@@ -23,9 +23,9 @@ import java.util.concurrent.Future
import java.util.concurrent.TimeoutException
import java.util.concurrent.TimeUnit
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
import scala.concurrent.Promise
+import scala.jdk.CollectionConverters._
import org.apache.commons.lang3.reflect.MethodUtils
import org.apache.spark.OneToOneDependency
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastJoinBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastJoinBase.scala
index c9b20f19..f6f929d3 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastJoinBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeBroadcastJoinBase.scala
@@ -16,8 +16,8 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.Partition
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeExpandBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeExpandBase.scala
index 217ed140..ada3240f 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeExpandBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeExpandBase.scala
@@ -16,8 +16,8 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.sql.auron.NativeConverters
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFileSourceScanBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFileSourceScanBase.scala
index 6c0ffb92..84e88606 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFileSourceScanBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFileSourceScanBase.scala
@@ -19,7 +19,7 @@ package org.apache.spark.sql.execution.auron.plan
import java.net.URI
import java.security.PrivilegedExceptionAction
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.commons.lang3.reflect.MethodUtils
import org.apache.hadoop.fs.FileSystem
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFilterBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFilterBase.scala
index 56b21e9a..0c29a6dd 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFilterBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeFilterBase.scala
@@ -16,9 +16,9 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
import scala.collection.mutable.ArrayBuffer
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.sql.auron.NativeConverters
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGenerateBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGenerateBase.scala
index 76e500aa..cea3f129 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGenerateBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeGenerateBase.scala
@@ -16,9 +16,9 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
import scala.collection.mutable.ArrayBuffer
+import scala.jdk.CollectionConverters._
import com.google.protobuf.ByteString
import org.apache.spark.OneToOneDependency
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeOrcScanBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeOrcScanBase.scala
index 36132e44..aad94388 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeOrcScanBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeOrcScanBase.scala
@@ -18,7 +18,7 @@ package org.apache.spark.sql.execution.auron.plan
import java.util.UUID
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.spark.Partition
import org.apache.spark.TaskContext
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetScanBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetScanBase.scala
index ddee72d3..e470a4b9 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetScanBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetScanBase.scala
@@ -18,7 +18,7 @@ package org.apache.spark.sql.execution.auron.plan
import java.util.UUID
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.spark.Partition
import org.apache.spark.TaskContext
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetSinkBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetSinkBase.scala
index 2bd50523..689b46e6 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetSinkBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeParquetSinkBase.scala
@@ -22,7 +22,7 @@ import java.util
import java.util.UUID
import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs.FileSystem
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeProjectBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeProjectBase.scala
index d5cbe933..109cf008 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeProjectBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeProjectBase.scala
@@ -16,9 +16,9 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
import scala.collection.mutable.ArrayBuffer
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.sql.auron.NativeConverters
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeRenameColumnsBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeRenameColumnsBase.scala
index f8bf6cb9..3d2b21fc 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeRenameColumnsBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeRenameColumnsBase.scala
@@ -16,7 +16,7 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.sql.auron.NativeHelper
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffleExchangeBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffleExchangeBase.scala
index 8b6aa04d..76648e8a 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffleExchangeBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffleExchangeBase.scala
@@ -19,9 +19,9 @@ package org.apache.spark.sql.execution.auron.plan
import java.util.UUID
import scala.annotation.nowarn
-import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
+import scala.jdk.CollectionConverters._
import scala.reflect.ClassTag
import scala.util.hashing.byteswap32
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffledHashJoinBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffledHashJoinBase.scala
index 17dfbe25..593243f9 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffledHashJoinBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeShuffledHashJoinBase.scala
@@ -16,8 +16,8 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.sql.auron.NativeConverters
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortBase.scala
index eea92cdb..579f3f3d 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortBase.scala
@@ -16,8 +16,8 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.sql.auron.NativeConverters
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortMergeJoinBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortMergeJoinBase.scala
index 1122093c..1b3518da 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortMergeJoinBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeSortMergeJoinBase.scala
@@ -16,8 +16,8 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.sql.auron.NativeConverters
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeTakeOrderedBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeTakeOrderedBase.scala
index dd7ed2f0..f5482187 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeTakeOrderedBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeTakeOrderedBase.scala
@@ -16,9 +16,9 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
import scala.collection.mutable.ArrayBuffer
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.sql.auron.NativeConverters
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeUnionBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeUnionBase.scala
index bf3a1549..822b6176 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeUnionBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeUnionBase.scala
@@ -16,9 +16,9 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters.asJavaIterableConverter
import scala.collection.immutable.SortedMap
import scala.collection.mutable.ArrayBuffer
+import scala.jdk.CollectionConverters._
import org.apache.spark.rdd.PartitionerAwareUnionRDD
import org.apache.spark.rdd.PartitionerAwareUnionRDDPartition
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeWindowBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeWindowBase.scala
index a7a0792b..fad61ff0 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeWindowBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/execution/auron/plan/NativeWindowBase.scala
@@ -16,8 +16,8 @@
*/
package org.apache.spark.sql.execution.auron.plan
-import scala.collection.JavaConverters._
import scala.collection.immutable.SortedMap
+import scala.jdk.CollectionConverters._
import org.apache.spark.OneToOneDependency
import org.apache.spark.sql.auron.NativeConverters
diff --git
a/spark-extension/src/main/scala/org/apache/spark/sql/hive/execution/auron/plan/NativeHiveTableScanBase.scala
b/spark-extension/src/main/scala/org/apache/spark/sql/hive/execution/auron/plan/NativeHiveTableScanBase.scala
index 9b2c0273..6dfc8be7 100644
---
a/spark-extension/src/main/scala/org/apache/spark/sql/hive/execution/auron/plan/NativeHiveTableScanBase.scala
+++
b/spark-extension/src/main/scala/org/apache/spark/sql/hive/execution/auron/plan/NativeHiveTableScanBase.scala
@@ -19,7 +19,7 @@ package org.apache.spark.sql.hive.execution.auron.plan
import java.net.URI
import java.security.PrivilegedExceptionAction
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.hadoop.fs.FileSystem
import org.apache.spark.broadcast.Broadcast
diff --git
a/thirdparty/auron-paimon/src/main/scala/org/apache/spark/sql/hive/execution/auron/plan/NativePaimonTableScanExec.scala
b/thirdparty/auron-paimon/src/main/scala/org/apache/spark/sql/hive/execution/auron/plan/NativePaimonTableScanExec.scala
index 2ae7efef..f136cf2a 100644
---
a/thirdparty/auron-paimon/src/main/scala/org/apache/spark/sql/hive/execution/auron/plan/NativePaimonTableScanExec.scala
+++
b/thirdparty/auron-paimon/src/main/scala/org/apache/spark/sql/hive/execution/auron/plan/NativePaimonTableScanExec.scala
@@ -18,8 +18,8 @@ package org.apache.spark.sql.hive.execution.auron.plan
import java.util.UUID
-import scala.collection.JavaConverters._
import scala.collection.Seq
+import scala.jdk.CollectionConverters._
import org.apache.paimon.io.DataFileMeta
import org.apache.paimon.table.FileStoreTable
diff --git
a/thirdparty/auron-uniffle/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/uniffle/AuronUniffleShuffleReader.scala
b/thirdparty/auron-uniffle/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/uniffle/AuronUniffleShuffleReader.scala
index 9a152eca..8ce1d70e 100644
---
a/thirdparty/auron-uniffle/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/uniffle/AuronUniffleShuffleReader.scala
+++
b/thirdparty/auron-uniffle/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/uniffle/AuronUniffleShuffleReader.scala
@@ -22,7 +22,7 @@ import java.util
import scala.annotation.nowarn
import scala.collection.AbstractIterator
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.commons.lang3.reflect.FieldUtils
import org.apache.hadoop.conf.Configuration
