From 44c3fe28d296ab76ae86d4854643b0782726a599 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Tue, 2 Dec 2025 17:49:26 +0800 Subject: [PATCH 1/2] [SPARK-54565][CORE] SparkBuildInfo should load spark-version-info.properties from its own classloader --- .../src/main/scala/org/apache/spark/SparkBuildInfo.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala b/common/utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala index ebc62460d231..7fb62370b04a 100644 --- a/common/utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala +++ b/common/utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala @@ -29,8 +29,8 @@ private[spark] object SparkBuildInfo { spark_build_date: String, spark_doc_root: String) = { - val resourceStream = Thread.currentThread().getContextClassLoader. - getResourceAsStream("spark-version-info.properties") + val resourceStream = SparkBuildInfo.getClass.getClassLoader + .getResourceAsStream("spark-version-info.properties") if (resourceStream == null) { throw new SparkException("Could not find spark-version-info.properties") } From 93df910e3706bd116501167a0ad978cc44ecadda Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Wed, 3 Dec 2025 13:09:12 +0800 Subject: [PATCH 2/2] Update common/utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala Co-authored-by: YangJie --- .../utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala b/common/utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala index 7fb62370b04a..7618105bd72e 100644 --- a/common/utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala +++ b/common/utils/src/main/scala/org/apache/spark/SparkBuildInfo.scala @@ -29,7 +29,7 @@ private[spark] object SparkBuildInfo { spark_build_date: String, spark_doc_root: String) = { - val resourceStream = SparkBuildInfo.getClass.getClassLoader + val resourceStream = getClass.getClassLoader .getResourceAsStream("spark-version-info.properties") if (resourceStream == null) { throw new SparkException("Could not find spark-version-info.properties")